DRY up the UI code substantially