refactoring+reintegrated settings menu