diff --git a/README.md b/README.md
index 5285da4..2803b58 100644
--- a/README.md
+++ b/README.md
@@ -100,54 +100,55 @@ For the full release history, follow the below link to the full release notes pa
 ### [Release Notes](https://bitbucket.org/ddreaper/unity-ui-extensions/wiki/ReleaseNotes/RELEASENOTES)###
 
 ---
-#[Controls and extensions listed in this project](https://bitbucket.org/ddreaper/unity-ui-extensions/wiki/Controls):#
+#[Controls and extensions listed in this project](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/Controls):#
 
-There are almost 70 extension controls / effect and other utilities in the project which are listed on the following page:
+There are almost 70+ extension controls / effect and other utilities in the project which are listed on the following page:
 
-##[UI Extensions controls list](https://bitbucket.org/ddreaper/unity-ui-extensions/wiki/Controls)##
+##[UI Extensions controls list](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/Controls)##
 
-[Controls](https://bitbucket.org/ddreaper/unity-ui-extensions/wiki/Controls#Controls)|||||
+[Controls](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/Controls#Controls)|||||
 ------|------|------|------|
 Accordion|ColorPicker|SelectionBox|UIButton|UIFlippable
 ComboBox|AutoCompleteComboBox|DropDownList|BoundToolTip|UIWindowBase
-UI_Knob|TextPic|InputFocus|Box Slider
+UI_Knob|TextPic|InputFocus|Box Slider|CooldownButton
 ||||
 
-[Primitives](https://bitbucket.org/ddreaper/unity-ui-extensions/wiki/Controls#Primitives)|||||
+[Primitives](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/Controls#Primitives)|||||
 ------|------|------|------|
 UILineRenderer|UILineTextureRenderer|UICircle|DiamondGraph|UICornerCut
 UIPolygon||||
 ||||
 
-[Layouts](https://bitbucket.org/ddreaper/unity-ui-extensions/wiki/Controls#Layouts)|||||
+[Layouts](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/Controls#Layouts)|||||
 ------|------|------|------|
 Horizontal Scroll Snap|Vertical Scroll Snap|Flow Layout Group|Radial Layout|Tile Size Fitter
 Scroll Snap (alt implementation)|Reorderable List|UI Vertical Scroller|Curved Layout|Table Layout
 ||||
 
-[Effects](https://bitbucket.org/ddreaper/unity-ui-extensions/wiki/Controls#Effects)|||||
+[Effects](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/Controls#Effects)|||||
 ------|------|------|------|
-Best Fit Outline|Curved Text|Gradient|Gradient2|Letter Spacing|
+Best Fit Outline|Curved Text|Gradient|Gradient2|Letter Spacing
 NicerOutline|RaycastMask|UIFlippable|UIImageCrop|SoftAlphaMask
 CylinderText|UIParticleSystem|||
 ||||
 
-[VR Components](https://bitbucket.org/ddreaper/unity-ui-extensions/wiki/Controls#VR)|||||
+[VR Components](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/Controls#VR)|||||
 ------|------|------|------|
 VRCursor|VRInputModule|||
 ||||
 
-[Input Modules](https://bitbucket.org/ddreaper/unity-ui-extensions/wiki/Controls#InputModules)|||||
+[Input Modules](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/Controls#InputModules)|||||
 ------|------|------|------|
 AimerInputModule|GamePadInputModule|||
 ||||
 
-[Additional Components](https://bitbucket.org/ddreaper/unity-ui-extensions/wiki/Controls#Additional_Components)|||||
+[Additional Components](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/Controls#Additional_Components)|||||
 ------|------|------|------|
 ReturnKeyTrigger|TabNavigation|uGUITools|ScrollRectTweener|ScrollRectLinker
 ScrollRectEx|UI_InfiniteScroll|UI_ScrollRectOcclusion|UIScrollToSelection|UISelectableExtension
 switchToRectTransform|ScrollConflictManager|CLFZ2 (Encryption)|Serialization|DragCorrector
-PPIViewer|UI_TweenScale|UI_InfiniteScroll|UI_ScrollRectOcclusion|
+PPIViewer|UI_TweenScale|UI_InfiniteScroll|UI_ScrollRectOcclusion|NonDrawingGraphic
+UILineConnector||||
 ||||
 
 *More to come*
diff --git a/Scripts/Controls/CooldownButton.cs b/Scripts/Controls/CooldownButton.cs
index 41f85fa..d1c0e05 100644
--- a/Scripts/Controls/CooldownButton.cs
+++ b/Scripts/Controls/CooldownButton.cs
@@ -6,6 +6,7 @@ using UnityEngine.EventSystems;
 
 namespace UnityEngine.UI.Extensions
 {
+    [AddComponentMenu("UI/Extensions/Cooldown Button")]
     public class CooldownButton : MonoBehaviour, IPointerDownHandler
     {
         #region Sub-Classes
diff --git a/Scripts/Utilities/UILineConnector.cs b/Scripts/Utilities/UILineConnector.cs
index 9d1bfdf..edc4c22 100644
--- a/Scripts/Utilities/UILineConnector.cs
+++ b/Scripts/Utilities/UILineConnector.cs
@@ -3,6 +3,7 @@
 
 namespace UnityEngine.UI.Extensions
 {
+    [AddComponentMenu("UI/Extensions/UI Line Connector")]
     [RequireComponent(typeof(UILineRenderer))]
     [ExecuteInEditMode]
     public class UILineConnector : MonoBehaviour
diff --git a/Scripts/Utilities/UIScrollToSelectionXY.cs b/Scripts/Utilities/UIScrollToSelectionXY.cs
index 9f40e1b..69d9c72 100644
--- a/Scripts/Utilities/UIScrollToSelectionXY.cs
+++ b/Scripts/Utilities/UIScrollToSelectionXY.cs
@@ -11,6 +11,7 @@ using UnityEngine.EventSystems;
 
 namespace UnityEngine.UI.Extensions
 {
+    [AddComponentMenu("UI/Extensions/UI ScrollTo Selection XY")]
     [RequireComponent(typeof(ScrollRect))]
     public class UIScrollToSelectionXY : MonoBehaviour
     {