fixed invoice model and view