Refactored the way review pages are generated