Bunch of structural changes and style changes to synch better with a master base.css file