minor changes to nav
conflict resolved files
sign up so far
ID merged