Review flow

Changed some minor things to revise the review flow