Fixed ui bug