Reorganised the motion settings into separate groups.