Fix UI and Multi Threading