changed to unified layout, preparation for inline settings forms