Fixes layout issues. Prepares to transition to more Foundation