Fixed some UI stuff