Feature/ui fixes

Just going to merge these changes in and start on a new branch so I can work out some of the other UX flows