Enhance Add widget button

Change-Id: I8b9a95772625f279edfa31a507a5630c39912a57