major layout work complete