Fixed few things on settings and messages