Main Layout Cleanup / Fix