Added subtotal, shop supplies and hazardous materials to estimates and updated total logic to reflect this