Update formatting and layout