controller settings switch
controls stay through level changes
Merge branch 'feature/more_controller_fixes' into develop