diff --git a/StratifyLabs/Doc/AnimationContainers.qml b/StratifyLabs/Doc/AnimationContainers.qml
deleted file mode 100644
index ca7e27b..0000000
--- a/StratifyLabs/Doc/AnimationContainers.qml
+++ /dev/null
@@ -1,24 +0,0 @@
-import QtQuick 2.6
-import StratifyLabs.UI 2.0
-
-EPane {
-  name: "AnimationContainers";
-  EHeading {
-    title: "Animation Containers";
-    inherits: "Item";
-    stratifyName: "SAnimationContainer";
-    defaultSize: "block";
-  }
-
-  ESectionTitle { text: "Description"; }
-  EParagraph { text: 'An SAnimationContainer is an object that \
-can be used to navigate through its resources by setting the "screen" name. An animation \
-type (e.g. SAnimationFade or SAnimationHPush) should be included in the container.'; }
-
-  SHLine{}
-
-  ESectionTitle { text: "Simple Example"; }
-  AnimationContainerExample{}
-  ECodeButton { source: "AnimationContainerExample"; }
-}
-
diff --git a/StratifyLabs/Doc/Animators.qml b/StratifyLabs/Doc/Animators.qml
new file mode 100644
index 0000000..cb8112f
--- /dev/null
+++ b/StratifyLabs/Doc/Animators.qml
@@ -0,0 +1,25 @@
+import QtQuick 2.6
+import StratifyLabs.UI 2.0
+
+EPane {
+  name: "Animators";
+  EHeading {
+    title: "Animators";
+    inherits: "Item";
+    stratifyName: "SAnimator";
+    defaultSize: "block";
+  }
+
+  ESectionTitle { text: "Description"; }
+  EParagraph { text: 'An <i>SAnimator</i> is an object that \
+can be used to navigate through its resources by setting the <i>screen</i> property. The <i>animation</i> \
+property can be set to either <i>SAnimationFade</i> (default) or <i>SAnimationHPush</i>.';
+  }
+
+  SHLine{}
+
+  ESectionTitle { text: "Simple Example"; }
+  AnimatorsExample{}
+  ECodeButton { source: "AnimatorsExample"; }
+}
+
diff --git a/StratifyLabs/Doc/AnimationContainerExample.qml b/StratifyLabs/Doc/AnimatorsExample.qml
similarity index 98%
rename from StratifyLabs/Doc/AnimationContainerExample.qml
rename to StratifyLabs/Doc/AnimatorsExample.qml
index 26a442f..73227ad 100644
--- a/StratifyLabs/Doc/AnimationContainerExample.qml
+++ b/StratifyLabs/Doc/AnimatorsExample.qml
@@ -28,7 +28,7 @@ SColumn {
     }
   }
 
-  SAnimationContainer {
+  SAnimator {
     id: animationContainer;
     implicitHeight: 300;
 
diff --git a/StratifyLabs/Doc/Attributes.qml b/StratifyLabs/Doc/Attributes.qml
index c5a4251..538fe2b 100644
--- a/StratifyLabs/Doc/Attributes.qml
+++ b/StratifyLabs/Doc/Attributes.qml
@@ -6,18 +6,22 @@ EPane {
   ESectionTitle { text: "Introduction"; }
   EParagraph { text: '\
 SL.UI allows you to quickly layout and style \
-QML applications. It does this by attaching an "SAttributes" \
+QML applications. It does this by including an <i>SAttributes</i> \
 object which then defines the size and color scheme. \
 There are two ways to change an object\'s attributes: \
-1) using "style" 2) using "attr" directly.';
+1) using <i>style</i> 2) using <i>attr</i> directly.';
   }
   EParagraph { text: '\
-Additionally, each item has quick access to "attr.span" through \
-the "span" property which \
+Additionally, each item has quick access to <i>attr.span</i> through \
+the <i>span</i> property which \
 defines the width of a SL.UI object in an <i>SRow</i>. Each SL.UI object \
 defines the properties listed below.';
   }
 
+  EReadMore {
+    tags: "Rows:SRow";
+  }
+
   ECodeBlockInline {
     text: '\
 property alias style: attr.style;
@@ -31,7 +35,7 @@ SAttributes {
   }
 
   EParagraph { text: '\
-Most SL.UI objects use SAttributes as the "attr" object. \
+Most SL.UI objects use <i>SAttributes</i> as the <i>attr</i> object. \
 SL.UI objects that don\'t have any color (e.g. <i>SPane</i>) use \
 <i>SSizeAttributes</i> (which <i>SAttributes</i> inherits). If an object \
 has additional attibutes, the object will be <i>S{Object}Attributes</i> \
@@ -41,7 +45,7 @@ of the object.'; }
 
   ESectionTitle { text: "Changing the Style"; }
   EParagraph { text: '\
-When a new value is assigned to the "style" property, \
+When a new value is assigned to the <i>style</i> property, \
 the string is parsed (left to right) and new colors and sizes are bound \
 to the object\'s attibutes.';
   }
@@ -86,8 +90,6 @@ options.';
   AttributeExampleSize{}
   ECodeButton { source: "AttributeExampleSize"; }
 
-
-
   SText { style: "block text-bold"; text: 'SAttributes'; }
   EParagraph { text: 'SAttributes (most objects) support the following style \
 options.'; }
@@ -171,8 +173,8 @@ options.'; }
   EBullet { text: "success"; }
 
   EParagraph { text: '\
-Each S{Object} may add additional styling options. For example \
-SButton uses "btn-outline-primary" for setting the color.';
+Each SL.UI object may add additional styling options. For example \
+SButton uses "btn-outline-primary" for setting the button\'s color scheme.';
   }
 
 
@@ -181,8 +183,8 @@ SButton uses "btn-outline-primary" for setting the color.';
   EParagraph { text: '\
 If the styling options above don\'t meet your needs, \
 you can directly access an item\'s attributes using the \
-"attr" property. This is useful if you want to bind to \
-specific attributes. The following example binds the icon "spin" \
+<i>attr</i> property. This is useful if you want to bind to \
+specific attributes. The following example binds the icon <i>spin</i> \
 attribute to a variable.';
   }
 
diff --git a/StratifyLabs/Doc/CheckBoxes.qml b/StratifyLabs/Doc/CheckBoxes.qml
index 8f08620..9439914 100644
--- a/StratifyLabs/Doc/CheckBoxes.qml
+++ b/StratifyLabs/Doc/CheckBoxes.qml
@@ -9,14 +9,22 @@ EPane {
     stratifyName: "SCheckBox";
   }
   ESectionTitle { text: "Description"; }
+  EParagraph { text: 'An <i>SCheckbox</i> can be used for non-exclusive \
+boolean input items. Use <i>SRadioButton</i> for exclusive boolean \
+input items.';
+  }
+
+  EReadMore {
+    tags: "RadioButtons:SRadioButton";
+  }
 
   SHLine{}
 
   ESectionTitle { text: "Example"; }
   CheckBoxExample{}
-  ECodeExample { source: "CheckBoxExample"; }
+  ECodeButton { source: "CheckBoxExample"; }
 
   ESectionTitle { text: "Custom Icons"; }
   CheckBoxExampleCustom{}
-  ECodeExample { source: "CheckBoxExampleCustom"; }
+  ECodeButton { source: "CheckBoxExampleCustom"; }
 }
diff --git a/StratifyLabs/Doc/Dropdowns.qml b/StratifyLabs/Doc/Dropdowns.qml
index aa3f3ef..ae34d1f 100644
--- a/StratifyLabs/Doc/Dropdowns.qml
+++ b/StratifyLabs/Doc/Dropdowns.qml
@@ -16,7 +16,7 @@ the user to select from a list of items. It can be populated \
 using an <i>SJsonModel</i> object or simply a QML <i>ListModel</i>.'; }
 
   EReadMore {
-    tags: "Models:SJsonModel";
+    tags: "JsonModels:SJsonModel";
   }
 
   SHLine{}
diff --git a/StratifyLabs/Doc/EHeading.qml b/StratifyLabs/Doc/EHeading.qml
index c304a5e..c273223 100644
--- a/StratifyLabs/Doc/EHeading.qml
+++ b/StratifyLabs/Doc/EHeading.qml
@@ -17,10 +17,10 @@ SPanel {
     SText { span: 6; style: "right"; text: panel.stratifyName; }
     SLabel { span: 6; style: "left"; text: "Inherits:"; }
     SText { span: 6; style: "right"; text: panel.inherits; }
-    SLabel { span: 6; style: "left"; text: "Special Attributes:"; visible: panel.specialAttibutes !== ""; }
-    SText { span: 6; style: "right"; text: panel.specialAttibutes; visible: panel.specialAttibutes !== ""; }
-    SLabel { span: 6; style: "left"; text: "Default Size:"; visible: panel.defaultSize !== ""; }
-    SText { span: 6; style: "right"; text: panel.defaultSize; visible: panel.defaultSize !== ""; }
+    //SLabel { span: 6; style: "left"; text: "Special Attributes:"; visible: panel.specialAttibutes !== ""; }
+    //SText { span: 6; style: "right"; text: panel.specialAttibutes; visible: panel.specialAttibutes !== ""; }
+    //SLabel { span: 6; style: "left"; text: "Default Size:"; visible: panel.defaultSize !== ""; }
+    //SText { span: 6; style: "right"; text: panel.defaultSize; visible: panel.defaultSize !== ""; }
   }
 
 }
diff --git a/StratifyLabs/Doc/EPane.qml b/StratifyLabs/Doc/EPane.qml
index 084b0e3..61c61d1 100644
--- a/StratifyLabs/Doc/EPane.qml
+++ b/StratifyLabs/Doc/EPane.qml
@@ -3,7 +3,7 @@ import QtQuick.Controls 2.1
 import StratifyLabs.UI 2.0
 
 
-SAnimationContainer {
+SAnimator {
   property string name;
   style: "block fill";
   default property alias data: contents.data;
diff --git a/StratifyLabs/Doc/FontAwesome.qml b/StratifyLabs/Doc/FontAwesome.qml
index 610712d..fd76b22 100644
--- a/StratifyLabs/Doc/FontAwesome.qml
+++ b/StratifyLabs/Doc/FontAwesome.qml
@@ -8,8 +8,8 @@ EPane {
 the latest release of Font Awesome. \
 The icons can be used using <i>SIcon</i>, \
 <i>SButton</i>, and <i>SBadge</i>. You can \
-also set the font.family of any text to <i>STheme.fontFontAwesome.name</i> \
-to use the font in other objects.'; }
+also set the <i>font.family</i> of any text to <i>STheme.fontFontAwesome.name</i> \
+to use the Font Awesome in other objects.'; }
 
   EReadMore {
     tags: "Badges:SBadge Buttons:SButton Icons:SIcon";
@@ -37,7 +37,7 @@ to use the font in other objects.'; }
 
 
   EParagraph { text: 'The current icon set is Font Awesome 4.7. The icons are available as \
-Fa.Icon.[name] where name is the name in the Font Awesome cheatsheet with "-" changed to "_".  Also, only \
+<i>Fa.Icon.[name]</i> where name is the name in the Font Awesome cheatsheet with "-" changed to "_".  Also, only \
 the original names are supported rather than the alias (e.g. use <i>Fa.Icon.times</i> rather than <i>Fa.Icon.remove</i>; see the link \
 below for more information).';
   }
diff --git a/StratifyLabs/Doc/Inputs.qml b/StratifyLabs/Doc/Inputs.qml
index 734e05a..6e6d107 100644
--- a/StratifyLabs/Doc/Inputs.qml
+++ b/StratifyLabs/Doc/Inputs.qml
@@ -12,7 +12,12 @@ EPane {
 
   ESectionTitle { text: "Description"; }
   EParagraph { text: 'An <i>SInput</i> is used
-to for a single line of text input.'; }
+to for a single line of text input. You multiple input lines, \
+use <i>STextBox</i>.'; }
+
+  EReadMore {
+    tags: "TextBoxes:STextBox";
+  }
 
   SHLine{}
 
diff --git a/StratifyLabs/Doc/Introduction.qml b/StratifyLabs/Doc/Introduction.qml
index 54451ea..2540a8a 100644
--- a/StratifyLabs/Doc/Introduction.qml
+++ b/StratifyLabs/Doc/Introduction.qml
@@ -9,7 +9,7 @@ EPane {
 Stratify Labs UI (SL.UI) 2.0 is a QML framework that works, looks, \
 and feels much like the twitter bootstrap HTML framework. The \
 colors and shapes of components can be customized using a theme \
-which uses familiar bootstrap. The UI also provides a responsive grid \
+which uses familiar bootstrap variables. The UI also provides a responsive grid \
 system that mimics bootstrap\'s ability to fit any screen.';
   }
   ESectionTitle { text: "Theme"; }
@@ -37,11 +37,16 @@ button that uses the <i>warning</i> color scheme.';
 
   EParagraph { text: '\
 SL.UI objects can be further customized by directly accessing \
-the "attr" property.'; }
+the <i>SAttributes</i> property via <i>attr</i>.'; }
+
+  EReadMore {
+    tags: "Attributes:SAttributes";
+  }
 
   IntroductionRoundButtonExample{}
   ECodeButton { source: "IntroductionRoundButtonExample"; }
 
+
   ESectionTitle { text: "Grid System"; }
   EParagraph { text: '\
 The responsive grid is based on two SL.UI objects: <i>SRow</i> and \
@@ -65,28 +70,29 @@ onWidthChanged: {
   }
 
   EParagraph { text: '\
-The following code block shows how two columns can change \
+The following example shows how two columns can change \
 to one when the screen is narrow. You can change the width of \
 the window (desktop) or switch from portrait to landscape (mobile) \
-to see the change. Small screen mode is ' + STheme.isScreenSm + '.';
+to see the change.';
   }
+  EParagraph { text: 'Small screen mode is <b>' + STheme.isScreenSm + '</b>.'; }
 
 
-    IntroductionButtonExample{}
-    ECodeButton { source: "IntroductionButtonExample"; }
+  IntroductionButtonExample{}
+  ECodeButton { source: "IntroductionButtonExample"; }
 
-    ESectionTitle { text: "Icons"; }
-    EParagraph { text: '\
-FontAwesome 4.7 is integrated in the UI. Icons can be used \
+  ESectionTitle { text: "Icons"; }
+  EParagraph { text: '\
+SL.UI comes with FontAwesome 4.7 integrated. Icons can be used \
 in <i>SBadge</i>, <i>SButton</i> and <i>SIcon</i>. Here is a sample.';
-    }
+  }
 
-    EReadMore {
-      tags: "Badges:SBadge Buttons:SButton Icons:SIcon";
-    }
+  EReadMore {
+    tags: "Badges:SBadge Buttons:SButton Icons:SIcon";
+  }
 
-    IntroductionIconExample{}
-    ECodeButton { source: "IntroductionIconExample"; }
+  IntroductionIconExample{}
+  ECodeButton { source: "IntroductionIconExample"; }
 
-  }
+}
 
diff --git a/StratifyLabs/Doc/JsonModelExample.qml b/StratifyLabs/Doc/JsonModelExample.qml
index eda9ce6..db11fcb 100644
--- a/StratifyLabs/Doc/JsonModelExample.qml
+++ b/StratifyLabs/Doc/JsonModelExample.qml
@@ -2,9 +2,15 @@ import QtQuick 2.7
 import StratifyLabs.UI 2.0
 
 SRow {
+  SText {
+    span: 4;
+    style: "left text-h1 top";
+    text: "List";
+  }
+
   SListGroup {
     span: 8;
-    style: "block center";
+    style: "block right";
     model: SJsonModel {
       id: model;
       json: "{ \"data\": [{ \"text\": \"List Item 1\" },
diff --git a/StratifyLabs/Doc/ListExample.qml b/StratifyLabs/Doc/ListExample.qml
index 319eadd..35c05a2 100644
--- a/StratifyLabs/Doc/ListExample.qml
+++ b/StratifyLabs/Doc/ListExample.qml
@@ -2,10 +2,17 @@ import QtQuick 2.7
 import StratifyLabs.UI 2.0
 
 SRow {
+
+  SText {
+    span: 4;
+    style: "left text-h1 top";
+    text: "List";
+  }
+
   SList {
     id: list;
     span: 8;
-    style: "block center padding-zero";
+    style: "block right padding-zero";
     model: SJsonModel {
       id: model;
       json: "{ \"data\": [{ \"text\": \"List Item 1\" },
diff --git a/StratifyLabs/Doc/ListExampleListGroup.qml b/StratifyLabs/Doc/ListExampleListGroup.qml
index c2da2c3..8a96da0 100644
--- a/StratifyLabs/Doc/ListExampleListGroup.qml
+++ b/StratifyLabs/Doc/ListExampleListGroup.qml
@@ -1,9 +1,16 @@
 import StratifyLabs.UI 2.0
 
 SRow {
+
+  SText {
+    span: 4;
+    style: "left text-h1 top";
+    text: "List Group";
+  }
+
   SListGroup {
     span: 8;
-    style: "block center";
+    style: "block right";
     model: SJsonModel {
       id: model;
       json: "{ \"data\": [{ \"text\": \"List Item 1\" },
diff --git a/StratifyLabs/Doc/ProgressBars.qml b/StratifyLabs/Doc/ProgressBars.qml
index 29a75f8..d77c3ee 100644
--- a/StratifyLabs/Doc/ProgressBars.qml
+++ b/StratifyLabs/Doc/ProgressBars.qml
@@ -11,7 +11,7 @@ EPane {
 
   ESectionTitle { text: "Description"; }
   EParagraph { text: 'An <i>SProgressBar</i> can show \
-linear progress (not used for indeterminate progrss yet).'; }
+linear progress (not used for indeterminate progress yet).'; }
 
   SHLine{}
 
diff --git a/StratifyLabs/Doc/ProgressCircles.qml b/StratifyLabs/Doc/ProgressCircles.qml
index 002cb9e..b541da5 100644
--- a/StratifyLabs/Doc/ProgressCircles.qml
+++ b/StratifyLabs/Doc/ProgressCircles.qml
@@ -10,7 +10,7 @@ EPane {
   }
 
   ESectionTitle { text: "Description"; }
-  EParagraph { text: 'An <i>SProgressCircle</i> show linear \
+  EParagraph { text: 'An <i>SProgressCircle</i> shows linear \
 progress but with a greater prominance to the user than an <i>SProgressBar</i>.'; }
 
   EReadMore {
diff --git a/StratifyLabs/Doc/Rows.qml b/StratifyLabs/Doc/Rows.qml
index e3a5e71..01f5656 100644
--- a/StratifyLabs/Doc/Rows.qml
+++ b/StratifyLabs/Doc/Rows.qml
@@ -15,7 +15,7 @@ EPane {
     style: "block";
     text: 'An SRow arranges items in a row. \
 If the items won\'t fit in the row, the items are arranged in a grid. Each row \
-can have a total span of STheme.grid_columns (which defaults to a value of ' + STheme.grid_columns + ').';
+can have a total span of <i>STheme.grid_columns</i> (which defaults to a value of ' + STheme.grid_columns + ').';
   }
 
     SText {
@@ -31,8 +31,8 @@ narrow than STheme.screen_sm.";
 }';
     }
 
-    EParagraph { text: 'With that code, SRow will change the \
-number of columns from STheme.grid_columns (' + STheme.grid_columns + ') to STheme.grid_columns_sm \
+    EParagraph { text: 'With that code, <i>SRow</i> will change the \
+number of columns from <i>STheme.grid_columns</i> (' + STheme.grid_columns + ') to <i>STheme.grid_columns_sm</i> \
 (' + STheme.grid_columns_sm + ').'; }
 
       SHLine{}
@@ -45,10 +45,11 @@ number of columns from STheme.grid_columns (' + STheme.grid_columns + ') to SThe
 as well as the number of columns in each mode by adding the code below to the main "ApplicationWindow" \
 object.'; }
 
-      SWell {
-        text: 'Component.onCompleted: {
-        STheme.grid_columns_sm = 6;
-        STheme.screen_sm = 600;
+      ECodeBlockInline {
+        text: '\
+Component.onCompleted: {
+  STheme.grid_columns_sm = 6;
+  STheme.screen_sm = 600;
 }';
       }
 
diff --git a/StratifyLabs/Doc/TableExample.qml b/StratifyLabs/Doc/TableExample.qml
index 75b30fe..8f90a96 100644
--- a/StratifyLabs/Doc/TableExample.qml
+++ b/StratifyLabs/Doc/TableExample.qml
@@ -2,6 +2,13 @@ import QtQuick 2.6
 import StratifyLabs.UI 2.0
 
 SRow {
+
+  SText {
+    span: 4;
+    style: "left top text-h3";
+    text: "Table";
+  }
+
   STable{
     span: 8;
     style: "center table-hover";
diff --git a/StratifyLabs/Doc/TableExampleOptions.qml b/StratifyLabs/Doc/TableExampleOptions.qml
index 938b1ef..171c7c4 100644
--- a/StratifyLabs/Doc/TableExampleOptions.qml
+++ b/StratifyLabs/Doc/TableExampleOptions.qml
@@ -23,17 +23,23 @@ SColumn {
     }
   }
 
+  SText {
+    span: 4;
+    style: "left top text-h3";
+    text: "Striped";
+  }
+
   SRow {
     SContainer {
       span: 8;
       height: 450;
-      style: "padding-zero center";
+      style: "padding-zero right";
       /* The following table will fill the container
           rather than simply taking up its
           implicitHeight. */
       STable{
         model: tableData;
-        style: "fill table-striped";
+        style: "fill table-striped top";
 
         STableColumn {
           span: 6;
@@ -50,11 +56,17 @@ SColumn {
     }
   }
 
+  SText {
+    span: 4;
+    style: "left top text-h3";
+    text: "Condensed";
+  }
+
   SRow {
     STable{
       span: 8;
       model: tableData;
-      style: "center table-condensed";
+      style: "right table-condensed top";
 
       STableColumn {
         span: 6;
@@ -70,11 +82,17 @@ SColumn {
     }
   }
 
+  SText {
+    span: 4;
+    style: "left top text-h3";
+    text: "Bordered";
+  }
+
   SRow {
     STable {
       span: 8;
       model: tableData;
-      style: "center table-bordered";
+      style: "right table-bordered top";
 
       STableColumn {
         span: 6;
diff --git a/StratifyLabs/Doc/Theme.qml b/StratifyLabs/Doc/Theme.qml
index e4b1321..df5c3ea 100644
--- a/StratifyLabs/Doc/Theme.qml
+++ b/StratifyLabs/Doc/Theme.qml
@@ -12,7 +12,7 @@ which defines colors, fonts, spacing, and shapes for the application.';
   EParagraph { text: '\
 The following example shows how to change the primary and \
 secondary brand colors. This code typically goes in the \
-main "ApplicationWindow".';
+main <i>ApplicationWindow</i>.';
   }
   ECodeBlockInline {
     text: '\
@@ -23,7 +23,7 @@ Component.onCompleted: {
   }
 
   ESectionTitle { text: "Reference"; }
-  EParagraph { text: 'See the STheme.qml file for a full list of variables.'; }
+  EParagraph { text: 'See the <i>STheme.qml</i> file for a full list of variables.'; }
 
   SButton {
     style: "btn-outline-info block";
diff --git a/StratifyLabs/Doc/ToolTipExample.qml b/StratifyLabs/Doc/ToolTipExample.qml
index 3cf0da4..323dcb0 100644
--- a/StratifyLabs/Doc/ToolTipExample.qml
+++ b/StratifyLabs/Doc/ToolTipExample.qml
@@ -30,4 +30,17 @@ SRow {
       text: "Input Box";
     }
   }
+
+  SDropdown {
+    style: "block";
+    span: 12;
+    model:
+        ["First",
+      "Second",
+      "Third",
+      "Fourth"];
+    SToolTip {
+      text: "Dropdown";
+    }
+  }
 }
diff --git a/StratifyLabs/Doc/ToolTips.qml b/StratifyLabs/Doc/ToolTips.qml
index 172d6d0..ef7a2f0 100644
--- a/StratifyLabs/Doc/ToolTips.qml
+++ b/StratifyLabs/Doc/ToolTips.qml
@@ -10,10 +10,14 @@ EPane {
   }
 
   ESectionTitle { text: "Description"; }
+  EParagraph { text: 'An <i>SToolTip</i> can be added to clickable \
+objects and will display a tool tip when hovered. <i>SToopTip</i> is not \
+currently implemented on touch interfaces.';
+  }
 
   SHLine{}
 
   ESectionTitle { text: "Example"; }
   ToolTipExample{}
-  ECodeExample { source: "ToolTipExample"; }
+  ECodeButton { source: "ToolTipExample"; }
 }
diff --git a/StratifyLabs/Doc/Wells.qml b/StratifyLabs/Doc/Wells.qml
index 2c6e7e4..99a4ce3 100644
--- a/StratifyLabs/Doc/Wells.qml
+++ b/StratifyLabs/Doc/Wells.qml
@@ -9,7 +9,11 @@ EPane {
     stratifyName: "SWell";
   }
   ESectionTitle { text: "Description"; }
-
+  EParagraph { text: 'An <i>SWell</i> is used to show a block of \
+text. It responds to size changes by setting the <i>style</i> property. \
+You can customize the color scheme by changing <i>attr.backgroundColor</i>, \
+<i>attr.fontColor</i> and/or <i>attr.borderColor</i>.';
+  }
   SHLine{}
 
   ESectionTitle { text: "Example"; }
diff --git a/StratifyLabs/Doc/main.qml b/StratifyLabs/Doc/main.qml
index 0d9ef9f..e507045 100644
--- a/StratifyLabs/Doc/main.qml
+++ b/StratifyLabs/Doc/main.qml
@@ -9,7 +9,9 @@ ApplicationWindow {
   visible: true;
   minimumWidth: 400;
   minimumHeight: 640;
-  title: "Stratify Labs UI";
+  title: "SL.UI";
+
+  property string version: "SL.UI 1.0 based on StratifyLabs.UI 2.0"
 
   width: 400;
   height: 600;
@@ -78,7 +80,7 @@ ApplicationWindow {
           EDrawerItem { label: "FontAwesome"; }
           SHLine{ attr.paddingVertical: 0; }
           EDrawerHeading { label: "Layouts"; icon: Fa.Icon.object_group; }
-          EDrawerItem { label: "AnimationContainers"; }
+          EDrawerItem { label: "Animators"; }
           EDrawerItem { label: "Columns"; }
           EDrawerItem { label: "Containers"; }
           EDrawerItem { label: "Rows"; }
@@ -116,13 +118,35 @@ ApplicationWindow {
 
   SModal {
     id: aboutModal;
-    title: "About";
+    title: "StratifyLabs UI";
     standardButtons: 0;
     SColumn {
+      SLabel {
+        style: "left padding-zero";
+        text: "Version";
+      }
+
+      SText {
+        style: "block";
+        text: version;
+      }
+
+      SLabel {
+        style: "left padding-zero";
+        text: "About";
+      }
+
       SText {
         style: "block";
         text: "StratifyLabs UI 2.0 is a QML framework that works, looks, and feels much like the twitter bootstrap HTML framework";
       }
+
+      SButton {
+        style: "btn-outline-info";
+        icon: Fa.Icon.github;
+        text: "Fork on Github";
+        onClicked: Qt.openUrlExternally("https://github.com/StratifyLabs/StratifyQML");
+      }
     }
   }
 
@@ -156,7 +180,7 @@ ApplicationWindow {
 
     }
 
-    SAnimationContainer {
+    SAnimator {
       id: animationContainer;
       style: "block fill";
 
@@ -174,7 +198,7 @@ ApplicationWindow {
         Attributes {},
         FontAwesome {},
 
-        AnimationContainers {},
+        Animators {},
         Columns {},
         Containers {},
         Rows {},
@@ -221,7 +245,7 @@ ApplicationWindow {
             span: 2;
             SButton {
               id: previousButton;
-              style: "left btn-naked text-on-primary";
+              style: "left btn-naked text-on-primary lg";
               icon: Fa.Icon.chevron_left;
               onClicked: screen = animationContainer.previous();
             }
@@ -244,13 +268,12 @@ ApplicationWindow {
             }
             SButton {
               id: nextButton;
-              style: "right btn-naked text-on-primary";
+              style: "right btn-naked text-on-primary lg";
               icon: Fa.Icon.chevron_right;
               onClicked: screen = animationContainer.next();
             }
           }
         }
-
       }
     }
   }
diff --git a/StratifyLabs/UI/UI.2/SPane.qml b/StratifyLabs/UI/UI.2/SPane.qml
index edd50f9..bdbe2e8 100644
--- a/StratifyLabs/UI/UI.2/SPane.qml
+++ b/StratifyLabs/UI/UI.2/SPane.qml
@@ -41,6 +41,7 @@ Flickable {
     }
 
     //This approach is used as opposed to direct binding in order to avoid binding loops
+    onVisibleChanged: updateContentRect();
     onWidthChanged: updateContentRect();
     onHeightChanged: updateContentRect();
     Component.onCompleted: updateContentRect();
diff --git a/StratifyLabs/UI/UI.2/SRow.qml b/StratifyLabs/UI/UI.2/SRow.qml
index 628ec47..e471f4a 100644
--- a/StratifyLabs/UI/UI.2/SRow.qml
+++ b/StratifyLabs/UI/UI.2/SRow.qml
@@ -34,7 +34,6 @@ GridLayout {
         span: STheme.grid_columns;
     }
 
-    onVisibleChanged: adjustWidth();
     rowSpacing: attr.paddingVertical;
     columnSpacing: attr.paddingHorizontal;
     columns: attr.span;
@@ -115,6 +114,10 @@ GridLayout {
         }
     }
 
+    onVisibleChanged: {
+      adjustWidth();
+    }
+
     onWidthChanged: {
         adjustWidth();
     }
diff --git a/StratifyLabs/UI/qmldir b/StratifyLabs/UI/qmldir
index 22aad28..00efb33 100644
--- a/StratifyLabs/UI/qmldir
+++ b/StratifyLabs/UI/qmldir
@@ -66,6 +66,7 @@ SWell 1.0 UI.1/SWell.qml
 singleton STheme 2.0 UI.2/STheme.qml
 SAlert 2.0 UI.2/SAlert.qml
 SAnimationContainer 2.0 UI.2/SAnimationContainer.qml
+SAnimator 2.0 UI.2/SAnimationContainer.qml
 SAnimationFade 2.0 UI.2/SAnimationFade.qml
 SAnimationHPush 2.0 UI.2/SAnimationHPush.qml
 SBadge 2.0 UI.2/SBadge.qml