fixed UI problems