Api for taxes, and improve in the ui