refractored layouts