Widgets, refactor, new features