Added a message window and the review behavior