Fixed main settings behavior