Some style changes and layout changes