Improved default view