Little improvements for page navigation.