moved elements to the header from user#index
fixed conlficts
added log in and log out with equivalent tests