Improved current page functionality