solved some UI problems