Tweaks to the UI flow and layout