Added background drawing for entities and new demo state