added logout button
fixed merge conflict in login helper