Correction and finish of Project Template demo