Simplification of controls and layout for mutations