Improve views

:cherries: