More formatting and layout in place