Fix report tables, and improve UI