changed controller to new question
sorted boxes of messages
conflicts