added results view
fixed merge conflicts