Still have to check when views are submitted for assessment, but now the
HTML/CSS are clearer and simpler.