Improved the messages flow, added show more button