FIX runOnUiThread and add more controls