improvements to ui layout and tab order