Fixed hash in URL needing to compensate for navigation bar
Merge branch 'master' into refactor