Fixed a minor editing and navigation bug.
Merge branch 'controls' into develop