Added logout button
Merge branch 'logout_btn'