Added log in and log out, new consolidated view.