Improve views

:melon: