Finished first pass on new navbar