Merge "Fix navigation to wrong page"