Moved refresh into UpdateBitmap