Some code cleanup in html and CSS, also added more divs and ids for layout in HTML and added a pile of new classes.