tax screen fixes