Unified the row control appearances.  Code cleanup.