widget classes refactoring
minor changes