Added Enhancements to Page Navigation and Dialog Handling