Rename layouts, consolidate richtext