Some styling and layout changes