Improved views and user experience