Fixed some UI uglyness