Fixed some UI and Rebuilt