Add more data to SORN and tax-disc digital takeup stub
Fix x position calculation of Tooltip component