FIX: positioning for new TARs didn't match corresponding test
MOD: Arranged Pin-Button differently