Make the widget a bit better;