Moved much of the code to partials, added content css, columns and whatnot