fixed issues, removed nav to push