Revert "[MR,CT]{issue} I12 - Changes because of usability tests."

This reverts commit 6bb91a93b6e2d3a8585737928cd2f6d8b9122742.
[MR,CT]{issue} I14 - Test evaluation.
[MR,CT]{issue} I15 - Evaluate numbers.