Simplify toggling logic
Id persistence, toggling keyboard shortcut (fixes #4) and focus fixes