Tidy views and styles, refactor related specs