Tidy up ensure_running
Add logout shortcut