UI changes and Logout added