Just some UI code cleanup.