Layout and format updates