Add Settings dropdown and tidy up navbar