added navbar, not totally working yet