* Fix Double Click problem by using UIElement Names instead of Types * Use lower case 'or' to follow project's common conventions