Changes Drawable to entity and made various changes.