Fixed some UI Bug