Enhance layout and styles