Correctly configure action buttons for display.

Minor code style corrections.
Fixes #1983