reorganize options page and patch a bunch of stuff

This pull request combines my patches from GH-6 and GH-11 with a reorganization of the options page, which [looks like this](https://imgur.com/phZ0bM6):

![screenshot of new changes](https://i.imgur.com/phZ0bM6.jpg)

Thanks for your consideration.