refactoring, changed settings view for some device
fix unit tests