Aesthetic fixes for OS X

Adjusts the advanced substitution panel to make it work well enough on
OS X.