did some formatting for the navbar
Fixed merge conflict
Fixed some bugs with notification