Fixed issues. Moved from Sprite to Bitmap