Changed to render on UI thread