Improve views

:boar: