fixing demo files
fixing templates