Fixed confAgain fsed demo navigation
Merge branch 'simplified'