further refactoring by renaming widget names
Better title