navbar redesign
corrected merge conflict
Merge pull request #12 from kevsherman/front_end_cleanup

Front end cleanup