Fixed ui issues