Some more changes to the controls