Email template and error page and Invoice page committed