Demo design, and fixing demo set edge labels