UI Tweaks

Updated the focus flow and tested the interface.