Main Layout fix