Still more style tweaks!

Things are starting to look pretty good. Now I need to attack the
scripting issues.