updated navbar sign in
fixed merge conflicts