Better options sorting and blank lines for grouping.

![](http://i.imgur.com/EuIuJz2.png)