Adjust the onDraw order
Fix data loader issue