Merge pull request #33 from iglesias/master

Attempt to fix disappearing subpages menu for notebook and demo
Fix bug from previous commit
subpage is not defined in demo nor notebook, use hardcoded names