review page and bug fix