Fixing minor non nicely displayed messeges