[TASK] Restructure layout and styling