Added Logout Dialog. Added TODO