Rework on UI layout