step 10.1 - layout enhacements