Refactor code, add new widgets.