Some style and layout updates