Again fixed confused demo navigation
Merge branch 'simplified'