Add totals to the mart and small improve to the design