cleaned up invoice form view