Added icons to option bar. Refactored some code in navigation_script.js