EST-324: Add tax to lease item; tidy up layout