Added scripts and modified templates