Added new template
Fixed and improved edit system