Better organized navbar
Better HTML