Working widget, minor bugs