Fix issues with peeps picked up
Refactored a bit of tooltip window. Added hack to fix #540 note this should be fixed better
Remove previous hack
Merge pull request #544 from duncanspumpkin/fix_540

Fix 540 (sort of)