Improved routing and page handling.