Fixed regressions in the UI