fixed some UI problems