Reorganize layout
Milestone leh