Modified widgets so that they are usable when embedded in other modules.