Feature/better display of results

good to review, @jteneycke