improvements for retweet layout.
Merge branch 'dev'