Cleaned up code, added widgets.WidgetSwitcher