fixing up some layouts