Co-authored-by: andymunro <48995441+andymunro@users.noreply.github.com>
* More changes based on feedback * Puts back 2 out of 3 screens