Fixed mozilla controls
Fixed mozilla menu
Merge branch 'controls_mozilla_fix' into develop