Couple more changes to navbar and event

Still work to be done on these to finish them up, committing to get
Matt's commit