Button class adjustments and general code cleanup.