Tidy up styles and views