Fixed some UI Issues