UI problems resolved