Added user names and some messages formatting