Some random changes I found that can probably be removed.
Updates nav, disables JavaScript loading
Merges commits from master.
Fixes some syntax issues and prepares for merge
Merge from master