Some changes in settings and shop base done