Cut down the user interface block elements to a reasonable amount.
Minor code cleanup.