Major styling and layout changes