Fixed Base links

Now that registration forms are complete I fixed links in base html to work correctly.  I also fixed the style in which the links were written in the nav bar.
Merge remote-tracking branch 'origin/master'