Moving some ControlSurfaceElements around to more sensible locations