Loads of layout and styling - started moving DOM stuff to views