major page structure changes - WIP: sizing nav and main to always be equal
merged from master