Fixed demo template
Added todo