Move review_queue templates and fix grouping