Tidy routing around Review page

@IanMayo Please check this.