Removed dependency on ui-gadget library