Updated top navbar structure
Fixed the links on the new navbar.
Added icons to the navbar