Make nav links flush right, with margin to the left
Merge branch 'nav-fix'