Revert "Revert "Update UI""

This reverts commit a236b67d3adcf2ee7136207e26ad011f158f65b0.