Merge some changes from colin-combe/interaction-viewer