Added jquery and fixed navbar not disappearing
made some changes
fixed merge conflict