Fixed up invoice screens