Remove some magic numbers, fix tooltip positioning