fixed navigation and related page UI generation issues