fixed up layouts/application