Reworked entire nav bar