Form ui tweaks

This is a small set of tweaks that make the form a little clearer and easier to use.

1. Filter and filter-having-keys tabs are merged
2. All list options now have their own delete link
3. Find all available keys and optionally add them to Groups pulldown
4. Change some wording here and there