add ui-gadget and fix them