UI-3556 All Templets/Applications/Bookmark Gadget - Incorrect UIs