Greg ui issues fix dec