Adoptions for performing test according to review

* changes in layout
* code adoptions
* two new partial views for both task types