Messages design improved