Messages design improvement