Fix UI and some logic bugs