Improved demo template