Resolve issues #82 and #51

This takes care of issues with the responsive nav-bar