Further style tweaks

The new 'secondary' choice gives a fuller range of style options (which
is nice for nested controls).