Fixing previous commit. Missing changes to Ui