Merge branch 'refactor-results-view'

Fixes #16