Refactor draw method and make genie appear at right position