Changed navbar to hold more material and better organized