No new functionality, just refactored main JS file.
Fixed nav button widths.
Merge branch 'test_branch'