Adding logout button
Merge from unstable