Adding better browsing