Editable Templates + Minor Changes