more stuff for widgets

Change-Id: If1c4cd6f9d770cf887b48f72a3db36cb76efba28