Rework wish screen and add candleg