refactoring + fixed resizing of decoration in matrix view