Updated navbar layout etc