Better add and edit info messages