widget: finishing up wiget code