Management of watched/known/active needs work to require less user action

It's ok that the wallet is restricted to one active account, but it should be possible to make any known account the active one if there is an active key for it without having to type the name. And it's really strange to me that you first have to clear an account from watched accounts before you make it the active account. I think this should be automatic. And it also seems reasonable that when you replace the active account, it would automatically go to being a watched account.

For most people, they are going to have several accounts they want to swap between as active account. This process should be as painless as possible (ideally done with a single operation). But here's the steps currently required:

Setup: I set an active account and several watched accounts and I want to swap which account is active.

1. First I got to active account page and I'm required to type the name of the account I want to switch to. This should be possible simply by selecting some known/watched account for which I have an active key and require no typing. But anyways, I type the name of one of my watched accounts, and it tells me I can't make it active because its watched. This is annoying too. I'd like it to just stop watching it and add it as active.
2. So I go to watched page and remove it from watched list.
3. Then I go back to active page and type the name yet again. Now it replaces my active account with the requested one. But almost for certain I would now like to watch the account that was previously my active account, so I have to go back to the watch page and add the old active account there.