Tweaked controls some more