Fixed some bugs & UI.