Code optimization, linting, cleanup
More optimization
Code cleanup
Adjusting nav
Merge branch 'master' into test