Improved views
Improved view part