cleaned up some layouts