Fixed some UI problems