Switched order of nav buttons
Merge branch 'template'