updates and layout refinements