port view logic to decorator
Merge branch 'fix/reduce_view_logic'