Adjusted UI and field tab order