Solve ui issue