Fixed ui errors