Improve collapsible handle targeting

resolves #83