Fixed ui again