add nav bar for sign up
fix small merge conflict