More final changes on Current Invoice page