removed navcol, added navbar