formatting and layout updates