moved tabs from form to results
merge conflict
tweaks