Added Template Form, Fixed Some Bugs