UI improvements; OnOff improvements; DbHelper refactoring