Modified some labels and messages