Fixed UI lag caused by heavy computation on the UI thread
Some fixes to the ADL scenario
Fixes