Minor fixes for the widget

Change-Id: I8a2be3202a49e948c92200b6cc7d3f4c90807f0f