add results template and modal
fix merge conflicts