Tried to solve UI problems