Slightly better xray catching logic. Buttons are more responsive.