Fixed the logout problem and other ui changes