Auto restart feature
Refactoring settings