working towards #199
Merge commit '9a2d1cbf1bafe8c54dd15ffe96df22ef455c58b1' into SetSelectionRefactor
look and feel adapted for #199
fixes #202