Improve single line replies, fix user badge