Enhancements to page functionality, Navigation Logic and small fixes