Rework basic layout prior to media query mods