switch navbar order
Merge pull request #205 from jamesyothers/master

switch navbar order