Preserve colors when editing layout, improved sizing