A couple of layout tweaks. Get rid of extra divs in base html.