Full rewrite of navbar

Full rewrite of navbar and change some elements