Nav alignment fixed
Fixed merge conflicts
Merge pull request #41 from jackvial/merge_nav

Merge nav