Updated Invoice form