Updated Templates, added User Forms