Added fixes and validation to review pages