EVWidgets: Fix disappearing widgets, and a little code cleanup.

Change-Id: I077d1cd9a6f1a7daceb895eac61237c507c8acc6