[TASK] Styling and reordering the layout