cleaned up the content view and the message dialog