Some more fixes to invoice layout