UI Refinement
UI Refinement/Polish and merge