Feature/improved view

The same.