Fixed demo back bug; more templates