Refactor row_decoration management