Some style and layout changes