UI Layout Changes
UI Code Cleanup
Exit and Save Buttons
UI Code Cleanup