More user-friendly logout controls