small layout tweak to prevent filter icons wrapping to newline.
cleanup matrixvieweer code