improved page-navigation