One of the challenges we have with our current tax code is the fact that it's based on income (salary, capital gains, etc). One idea is to use a value-added tax (VAT) that allows all consumption to be taxed. This is a big part of Andrew Yang's campaign to fund UBI.
https://www.yang2020.com/policies/value-added-tax/
He also wants to increase the IRS's funding which would help go after those super rich people and their lawyers.