Added Logout button to most screens