Improving messages in app