Adjusted UI
Tab order fixes