tidy up new demo menu setup