fix settings + content scripts & refactoring