moved logout button

moved logout button
clean up

Deleted extra join button. and got rid of navwrapper.