First round of changes to base.html for new design. Still some bugs to work out