Tweak demo figures; a few commits from the 2layer branch