diff --git a/src/UniversalDashboard.Community.psm1 b/src/UniversalDashboard.Community.psm1
index aa1a1c37..95dba48c 100644
--- a/src/UniversalDashboard.Community.psm1
+++ b/src/UniversalDashboard.Community.psm1
@@ -1,4 +1,4 @@
-Write-Warning -Message "This module is no longer supported. Universal Dashboard functionality has been moved into PowerShell Universal. To learn more, visit: https://www.ironmansoftware.com/powershell-universal"
+Write-Warning -Message "This module is no longer supported. Universal Dashboard functionality has been moved into PowerShell Universal. You can still host your UD Community dashboards for free within PowerShell Universal. To learn more, visit: https://www.ironmansoftware.com/powershell-universal"
 # SIG # Begin signature block
 # MIIXvwYJKoZIhvcNAQcCoIIXsDCCF6wCAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB
 # gjcCAQSgWzBZMDQGCisGAQQBgjcCAR4wJgIDAQAABBAfzDtgWUsITrck0sYpfvNR
diff --git a/src/v2/Components/ud-button.jsx b/src/v2/Components/ud-button.jsx
index 46fb5d1f..18425335 100644
--- a/src/v2/Components/ud-button.jsx
+++ b/src/v2/Components/ud-button.jsx
@@ -64,8 +64,23 @@ export default class UDButton extends React.Component {
         }
 
         var icon = null; 
+        var content = this.state.text; 
         if (this.state.icon) {
-            icon = <UdIcon icon={this.state.icon} style={{marginRight: this.state.floating || !this.state.text ? 'unset' : '5px'}}/>
+
+            var style = {}
+            const margin = this.state.floating || !this.state.text ? 'unset' : '5px';
+            if (margin === '5px' && this.props.iconAlignment === "left")
+            {
+                style["marginRight"] = margin;
+            }
+
+            if (margin === '5px' && this.props.iconAlignment === "right")
+            {
+                style["marginLeft"] = margin;
+            }
+
+            icon = <UdIcon icon={this.state.icon} style={style}/>
+            content = this.props.iconAlignment === "left" ? [icon, content] : [content, icon];
         }
 
         return <Button 
@@ -77,8 +92,7 @@ export default class UDButton extends React.Component {
                     floating={this.state.floating} 
                     style={this.state.style}
                 >
-                    {icon}
-                    {this.state.text}
+                    {content}
                 </Button>
     }
 }
diff --git a/src/v2/Components/ud-footer.jsx b/src/v2/Components/ud-footer.jsx
index 8b996348..2529adcc 100644
--- a/src/v2/Components/ud-footer.jsx
+++ b/src/v2/Components/ud-footer.jsx
@@ -1,10 +1,16 @@
 import React from 'react';
 import UdLink from './ud-link.jsx'
 
+const style = {
+    position: 'absolute',
+    width: '100%',
+    bottom: '0'
+}
+
 export default class UdFooter extends React.Component {
     render() {
         if (this.props.footer == null) {
-            return <footer className="page-footer ud-footer" style={{backgroundColor: this.props.backgroundColor, color: this.props.fontColor}}>
+            return <footer id="ud-footer" style={style} className="page-footer ud-footer" style={{backgroundColor: this.props.backgroundColor, color: this.props.fontColor}}>
                 <div className="footer-copyright">
                     <div className="container">
                         <a className="grey-text text-lighten-4 right" href="http://www.poshud.com">Created with PowerShell Universal Dashboard</a>
@@ -15,21 +21,20 @@ export default class UdFooter extends React.Component {
             var links = null;
             if (this.props.footer.links) {
                 links = this.props.footer.links.map(function(x, i) {
-                    return <UdLink {...x} key={x.url} className="grey-text text-lighten-4"/>
+                    return <p><UdLink {...x} key={x.url} className="grey-text text-lighten-4"/></p>
                 });
             }
 
             var backgroundColor = this.props.footer.backgroundColor ? this.props.footer.backgroundColor : this.props.backgroundColor;
             var fontColor = this.props.footer.fontColor ? this.props.footer.fontColor : this.props.fontColor;
 
-            return <footer className="page-footer ud-footer" style={{backgroundColor: backgroundColor, color: fontColor}}>
+            return <footer id="ud-footer" style={style} className="page-footer ud-footer" style={{backgroundColor: backgroundColor, color: fontColor}}>
                 <div className="footer-copyright" style={{backgroundColor: backgroundColor, color: fontColor}}>
                     <div className="container">
                         {this.props.footer.copyright}
                         <div className="right">
                             {links}
                         </div>
-                        <a className="grey-text text-lighten-4 right" href="http://www.poshud.com">Created with PowerShell Universal Dashboard</a>
                     </div>
                 </div>
             </footer>
diff --git a/src/v2/Components/ud-input.jsx b/src/v2/Components/ud-input.jsx
index 67abbb98..5b3d90d5 100644
--- a/src/v2/Components/ud-input.jsx
+++ b/src/v2/Components/ud-input.jsx
@@ -115,7 +115,7 @@ export default class Input extends React.Component {
             formData.append(x.name + "_type", x.type)
         })
         
-        UniversalDashboard.postFormData(`/api/internal/component/input/${this.props.id}`, formData, res => {
+        UniversalDashboard.postFormData(`/api/internal/component/element/${this.props.id}`, formData, res => {
                 if (res.error) {
 
                     UniversalDashboard.toaster.error({message: res.error.message})
diff --git a/src/v2/Components/ud-monitor.jsx b/src/v2/Components/ud-monitor.jsx
index a464c528..8d1ec18d 100644
--- a/src/v2/Components/ud-monitor.jsx
+++ b/src/v2/Components/ud-monitor.jsx
@@ -243,25 +243,25 @@ export default class UdMonitor extends React.Component {
         }
 
         var chart = null;
-        switch(this.props.chartType) {
+        switch(this.props.chartType.toLowerCase()) {
             // Bar
-            case 0:
+            case "bar":
                 chart = this.renderBar(data, options);
                 break;
             // Line
-            case 1:
+            case "line":
                 chart = this.renderLine(data, options);
                 break;
             // Area
-            case 2:
+            case "area":
                 chart = this.renderArea(data, options);
                 break;
             // Doughnut
-            case 3:
+            case "doughnut":
                 chart = this.renderDoughnut(data, options);
                 break;
             // Radar
-                case 3:
+                case "radar":
                 chart = this.renderRadar(data, options);
                 break;
         }
diff --git a/src/v2/Scripts/error.ps1 b/src/v2/Scripts/error.ps1
new file mode 100644
index 00000000..77ae8fb5
--- /dev/null
+++ b/src/v2/Scripts/error.ps1
@@ -0,0 +1,17 @@
+function New-UDError {
+    param(
+        [Parameter(Mandatory)]
+        [string]$Message,
+        [Parameter()]
+        [string]$Title
+    )
+
+    @{
+        type = "error"
+        isPlugin = $true 
+        assetId = $AssetId 
+
+        message = $Message
+        title = $Title
+    }
+}
\ No newline at end of file
diff --git a/src/v2/Scripts/footer.ps1 b/src/v2/Scripts/footer.ps1
new file mode 100644
index 00000000..ecab13f7
--- /dev/null
+++ b/src/v2/Scripts/footer.ps1
@@ -0,0 +1,23 @@
+function New-UDFooter {
+    param(
+        [Parameter()]
+		[Hashtable[]]$Links,
+        [Parameter()]
+        [string]$Copyright,
+		[Parameter()]
+		[DashboardColor]$BackgroundColor,
+		[Parameter()]
+		[DashboardColor]$FontColor
+    )
+
+    @{
+        type = "ud-footer"
+        isPlugin = $true 
+        assetId = $AssetId
+        
+        links = $Links 
+        copyright = $Copyright 
+        backgroundColor = $BackgroundColor.HtmlColor 
+        fontColor = $FontColor.HtmlColor
+    }
+}
\ No newline at end of file
diff --git a/src/v2/Scripts/input.ps1 b/src/v2/Scripts/input.ps1
new file mode 100644
index 00000000..83ff2edd
--- /dev/null
+++ b/src/v2/Scripts/input.ps1
@@ -0,0 +1,276 @@
+function New-UDInput {
+    param(
+
+        [Parameter()]
+        [string]$Id = [Guid]::NewGuid(),
+
+		[Parameter()]
+		[string]$Title,
+
+		[Parameter()]
+		[string]$SubmitText = "Submit",
+
+		[Parameter()]
+		[DashboardColor]$BackgroundColor,
+
+		[Parameter()]
+		[DashboardColor]$FontColor,
+
+		[Parameter(Mandatory)]
+		[ScriptBlock]$Endpoint,
+
+		[Parameter()]
+		[ScriptBlock]$Content,
+
+        [Parameter()]
+        [Switch]$Validate
+    )
+
+    $fields = @()
+    if ($Content)
+    {
+        $fields = & $Content 
+    }
+    else 
+    {
+        $ParamBlock = $Endpoint.Ast.ParamBlock
+        if ($null -ne $ParamBlock)
+        {
+            foreach($parameter in $ParamBlock.Parameters)
+            {
+                $field = @{
+                    name = $parameter.Name.VariablePath.ToString()
+                    value = ''
+                    type = ''                    
+                    dotNetType = ''
+                }
+
+                if ($parameter.StaticType -eq [bool] -or $parameter.StaticType -eq [Switch])
+                {
+                    $field.value = "false"
+                    $field.type = 'checkbox'
+                    $field.dotNetType = $parameter.StaticType.FullName
+                }
+                elseif ($parameter.StaticType.IsEnum)
+                {
+                    $field.Type = 'select'
+                    $field.validOptions = [Enum]::GetNames($parameter.StaticType)
+                    $field.dotNetType = $parameter.StaticType.FullName
+                    $field.Value = [string]([Enum]::GetValues($parameter.StaticType) | Select-Object -First 1)
+                }
+                elseif ($Parameter.StaticType -eq [DateTime])
+                {
+                    $field.type = 'date';
+                    $field.dotNetType = $parameter.StaticType.FullName
+                }
+                elseif ($Parameter.StaticType -eq [System.Security.SecureString])
+                {
+                    $field.type = 'password';
+                    $field.dotNetType = $parameter.StaticType.FullName
+                }
+                elseif ($Parameter.StaticType -eq [string[]])
+                {
+                    $field.type = 'textarea';
+                    $field.dotNetType = $parameter.StaticType.FullName
+                }
+                else 
+                {
+                    $field.Type = 'textbox'
+                    $field.DotNetType = [string].FullName
+                }
+
+                $fields += $field
+            }
+        }
+    }
+
+    $CustomEndpoint = {
+        function ConvertTo-Type {
+            param(
+                [string]$VariableName
+            )
+
+            $Value = Get-Variable -Name $VariableName -ValueOnly
+            $Type = Get-Variable -Name "$($VariableName)_type" -ValueOnly
+
+            if ($Type -eq 'checkbox')
+            {
+                [bool]$out = $false
+                [bool]::TryParse($Value, [ref]$out) | Out-Null
+                $Value = $out
+            }
+            elseif ($Type -eq 'date')
+            {
+                [DateTime]$out = [DateTime]::MinValue
+                [DateTime]::TryParseExact($Value, "dd-MM-yyyy", $Host.CurrentCulture, 'none', [ref]$out)
+                $Value = $out
+            }
+
+            $Value
+        }
+
+        function Invoke-PSUForm 
+        {
+            #content
+        }
+
+        $parameters = @{}
+
+        #parameters
+
+        Invoke-PSUForm @parameters
+    }
+
+    $parameterStr = ''
+    foreach($field in $fields)
+    {
+         $parameterStr += "if (-not [String]::IsNullOrEmpty(`$$($field.Name))) { `$parameters['$($field.Name)'] = ConvertTo-Type -VariableName '$($field.Name)' $([Environment]::NewLine) }"
+    }
+
+    $Endpoint = [ScriptBlock]::Create($CustomEndpoint.ToString().Replace("#content", $Endpoint.ToString()).Replace("#parameters", $parameterStr))
+
+    [Endpoint]$e = $Endpoint
+    $e.Register($Id, $PSCmdlet)
+
+    Write-Debug ($Endpoint.ToString())
+
+    @{
+        type = "ud-input"
+        isPlugin = $true 
+        assetId = $AssetId 
+
+        title = $title 
+        submitText = $SubmitText 
+        backgroundColor = $BackgroundColor.HtmlColor
+        fontColor = $FontColor.HtmlColor
+        validate = $Validate.IsPresent
+        fields = $fields
+        id = $id
+    }
+}
+
+function New-UDInputField {
+    param(
+        [Parameter(Mandatory)]
+        [string]$Name,
+
+        [Parameter()]
+        [Switch]$Mandatory,
+
+        [Parameter()]
+        [object[]]$Values,
+
+        [Parameter()]
+        [object]$DefaultValue,
+
+        [Parameter()]
+        [string[]]$Placeholder,
+
+        [Parameter()]
+        [Switch]$Disabled,
+
+        [Parameter()]
+        [ValidateSet("textbox", "checkbox", "select", "radioButtons", "password", "textarea", "switch", "date", "file", "time", "binaryFile")]
+        [string]$Type,
+
+        [Parameter(ParameterSetName = "datetime")]
+        [string]$OkText = "Ok",
+
+        [Parameter(ParameterSetName = "datetime")]
+        [string]$CancelText = "Cancel",
+
+        [Parameter(ParameterSetName = "datetime")]
+        [string]$ClearText = "Clear"
+    )
+
+    if ($Type -eq 'select' -and -not $DefaultValue -and $Values -and $Values.Length -gt 0)
+    {
+        $DefaultValue = $Values | Select-Object -First 1
+    }
+
+    $inputType = [string]
+    if ($Type -eq 'checkbox')
+    {
+        $inputType = [bool]
+    }
+
+    if ($Type -eq 'date')
+    {
+        $inputType = [DateTime]
+    }
+
+    @{
+        name = $Name 
+        required = $Mandatory.IsPresent
+        validOptions = $Values
+        value = $DefaultValue
+        placeholder = $Placeholder
+        disabled = $Disabled.IsPresent
+        type = $type
+        okText = $OkText
+        cancelText = $CancelText 
+        clearText = $ClearText 
+        dotNetType = $inputType.FullName
+    }
+}
+
+function New-UDInputAction {
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory, ParameterSetName = "toast")]
+		[string]$Toast,
+
+	    [Parameter(ParameterSetName = "toast")]
+	    [int]$Duration = 1000,
+
+	    [Parameter(Mandatory, ParameterSetName = "redirect")]
+		[string]$RedirectUrl,
+
+		[Parameter(Mandatory, ParameterSetName = "content")]
+		[ScriptBlock]$Content,
+
+		[Parameter()]
+		[Switch]$ClearInput
+    )
+
+    if ($Toast)
+    {
+        @{
+            type = "toast"
+            text = $Toast 
+            duration = $Duration 
+            clearInput = $ClearInput.IsPresent
+        }
+    }
+    elseif ($RedirectUrl)
+    {
+        @{
+            type = "redirect"
+            route = $RedirectUrl
+        }
+    }
+    elseif ($Content)
+    {
+        $c = @()
+        try 
+        {
+            $c = & $Content 
+        }
+        catch
+        {
+            $c = New-UDError -Message $_
+        }
+
+        @{
+            type = "content"
+            components = $c
+        }
+    }
+    else 
+    {
+        @{
+            type = "clear"
+            clearInput = $true 
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/v2/Scripts/interactive/Show-Toast.ps1 b/src/v2/Scripts/interactive/Show-Toast.ps1
index 8c518418..5e1c0733 100644
--- a/src/v2/Scripts/interactive/Show-Toast.ps1
+++ b/src/v2/Scripts/interactive/Show-Toast.ps1
@@ -70,7 +70,7 @@ function Show-UDToast
         position = $Position
         backgroundColor = $BackgroundColor.HtmlColor
         theme = $Theme
-        #icon = Icon == FontAwesomeIcons.None ? "" : $"fa fa-{Icon.ToString().Replace("_", "-")}",
+        icon = if ($Icon -eq [FontAwesomeIcons]::None) { "" } else { [UniversalDashboard.Models.FontAwesomeIconsExtensions]::GetIconName($Icon) }
         iconColor = $IconColor.HtmlColor
         displayMode = if ($ReplaceToast.IsPresent) {2 } else { 0 }
         rtl = $RightToLeft.IsPresent
diff --git a/src/v2/Scripts/monitor.ps1 b/src/v2/Scripts/monitor.ps1
new file mode 100644
index 00000000..f23d7fb6
--- /dev/null
+++ b/src/v2/Scripts/monitor.ps1
@@ -0,0 +1,68 @@
+function New-UDMonitor {
+    param(
+        [Parameter()]
+        [string]$Id = [Guid]::NewGuid(),
+        [Parameter()]
+        [ValidateSet('bar', 'line', 'area', 'doughnut', 'radar', 'pie', 'horizontalBar')]
+		[string]$Type,
+		[Parameter(Mandatory)]
+		[string]$Title,
+		[Parameter()]
+		[int]$DataPointHistory = 10,
+		[Parameter()]
+		[Hashtable]$Options,
+		[Parameter()]
+		[DashboardColor[]]$ChartBackgroundColor,
+		[Parameter()]
+		[DashboardColor[]]$ChartBorderColor,
+		[Parameter()]
+		[DashboardColor]$BackgroundColor,
+		[Parameter()]
+		[string]$Width,
+		[Parameter()]
+		[string]$Height,
+		[Parameter()]
+		[DashboardColor]$FontColor,
+		[Parameter()]
+		[int]$BorderWidth = 1,
+		[Parameter()]
+		[string[]]$Labels = @(),
+		[Parameter()]
+		[Hashtable[]]$Links,
+		[Parameter()]
+        [ScriptBlock]$FilterFields,
+        [Parameter()]
+        [Switch]$AutoRefresh,
+        [Parameter()]
+        [int]$RefreshInterval,
+        [Parameter(Mandatory)]
+        [Endpoint]$Endpoint
+    )
+
+    $Endpoint.Register($Id, $PSCmdlet) | Out-Null
+
+    if (-not $Labels)
+    {
+        $Labels = @($Title)
+    }
+
+    @{
+        type = 'ud-monitor'
+        id = $id 
+        live = $true
+        labels = $Labels
+        title = $title 
+        dataPointHistory = $DataPointHistory
+        chartType = $Type.ToLower()
+        options = $Options
+        width = $Width 
+        height = $Height 
+        autoRefresh = $AutoRefresh
+        refreshInterval = $RefreshInterval 
+        backgroundColor = $BackgroundColor.HtmlColor 
+        fontColor = $FontColor.HtmlColor
+        links = $Links 
+        chartBackgroundColor = if($chartBackgroundColor) { $chartBackgroundColor.HtmlColor } else { @() }
+        chartBorderColor = if ($ChartBorderColor) { $ChartBorderColor.HtmlColor } else { @() }
+    }
+}
\ No newline at end of file
diff --git a/src/v2/Scripts/page.ps1 b/src/v2/Scripts/page.ps1
index bdc78884..23c96e00 100644
--- a/src/v2/Scripts/page.ps1
+++ b/src/v2/Scripts/page.ps1
@@ -1,13 +1,15 @@
 function New-UDPage 
 {
     param(
-		[Parameter(Position = 0, Mandatory = $true, ParameterSetName = "name")]
+        [Parameter()]
+        [string]$Id = [Guid]::NewGuid(),
+		[Parameter(Position = 0, Mandatory = $true)]
 		[string]$Name,
 	    [Parameter(Position = 1)]
 		[string]$Icon, 
-	    [Parameter(Position = 2)]
+	    [Parameter(Position = 2, ParameterSetName = "content")]
 		[ScriptBlock]$Content,
-		[Parameter(Position = 0, Mandatory = $true, ParameterSetName = "url")]
+		[Parameter(Position = 5)]
 		[string]$Url,
 		[Parameter(Position = 3)]
 		[Switch]$DefaultHomePage,
@@ -17,23 +19,32 @@ function New-UDPage
         [Endpoint]$Endpoint
     )
 
-    if ($PSCmdlet.ParameterSetName -eq 'endpoint')
+    if ($Endpoint)
     {
-        $Endpoint.Register($Name, $PSCmdlet)    
+        $Endpoint.Register($Id, $PSCmdlet)    
     }
 
-    if ($null -ne $Url -and -not $Url.StartsWith("/"))
+    if (-not [string]::IsNullOrEmpty($Url) -and -not $Url.StartsWith("/"))
     {
         $Url = "/" + $Url
     }
 
-    if ($Null -eq $Url -and $null -ne $Name)
+    if ([string]::IsNullOrEmpty($Url) -and $null -ne $Name)
     {
         $Url = "/" + $Name.Replace(' ', '-');
     }
 
     [array]$c = @()
-    if ($Content) { [array]$c = . $Content}
+    if ($Content) { 
+        try 
+        {
+            [array]$c = . $Content
+        }
+        catch 
+        {
+            [array]$c = New-UDError -Message $_ 
+        }
+    }
 
     @{
         name = $Name
diff --git a/src/v2/Scripts/row.ps1 b/src/v2/Scripts/row.ps1
index f804a2a5..4fa5f61d 100644
--- a/src/v2/Scripts/row.ps1
+++ b/src/v2/Scripts/row.ps1
@@ -16,11 +16,11 @@ function New-UDRow {
     if ($PSCmdlet.ParameterSetName -eq 'static') {
         New-UDElement -Tag 'div' -Attributes @{
             className = 'row'
-        } -Content $Columns
+        } -Content $Columns -Id $Id
     }
     else {
         New-UDElement -Tag 'div' -Attributes @{
             className = 'row'
-        } -Endpoint $Endpoint -AutoRefresh:$AutoRefresh -RefreshInterval $RefreshInterval 
+        } -Endpoint $Endpoint -AutoRefresh:$AutoRefresh -RefreshInterval $RefreshInterval -Id $Id
     }
 }
\ No newline at end of file
diff --git a/src/v2/Scripts/sidenav.ps1 b/src/v2/Scripts/sidenav.ps1
index 56df4910..fca7eb79 100644
--- a/src/v2/Scripts/sidenav.ps1
+++ b/src/v2/Scripts/sidenav.ps1
@@ -13,7 +13,16 @@ function New-UDSideNav {
     )
 
     [array]$c = @()
-    if ($Content) { [array]$c = & $Content }
+    if ($Content) { 
+        try 
+        {
+            [array]$c = & $Content 
+        }
+        catch 
+        {
+            [array]$c = @(New-UDError -Message $_)
+        }
+    }
 
     @{
         content = $c
@@ -26,6 +35,9 @@ function New-UDSideNav {
 
 function New-UDSideNavItem {
     param( 
+        [Parameter()]
+        [string]$Id = [Guid]::NewGuid(),
+
         [Parameter(ParameterSetName = "Divider")]
         [Switch]$Divider,
 
@@ -59,7 +71,15 @@ function New-UDSideNavItem {
     )
 
     [array]$c = @()
-    if ($Children) { [array]$c = & $Children;  }
+    if ($Children) { 
+        try {
+            [array]$c = & $Children;      
+        }
+        catch {
+            [array]$c = @(New-UDError -Message $_)
+        }
+        
+    }
 
     if ($OnClick) {
         $OnClick.Register($Id + "onClick", $PSCmdlet) | Out-Null
diff --git a/src/v2/Tests/button.tests.ps1 b/src/v2/Tests/button.tests.ps1
index 6925cb5f..bebec69b 100644
--- a/src/v2/Tests/button.tests.ps1
+++ b/src/v2/Tests/button.tests.ps1
@@ -30,6 +30,6 @@ Describe "New-UDButton" {
     It "has colors" {
         $Element = Find-SeElement -Id 'button7' -Driver $Driver
         $Style = Get-SeElementAttribute -Element $Element -Attribute "style"    
-        $Style | Should be "background-color: rgb(255, 0, 0); color: rgb(0, 0, 0);"
+        $Style | Should be "color: rgb(0, 0, 0); background-color: rgb(255, 0, 0); "
     }
 }
\ No newline at end of file
diff --git a/src/v2/Tests/dashboard.ps1 b/src/v2/Tests/dashboard.ps1
index a2ec9b20..34878170 100644
--- a/src/v2/Tests/dashboard.ps1
+++ b/src/v2/Tests/dashboard.ps1
@@ -1,3 +1,4 @@
+$DebugPreference = 'Continue'
 $Cache:StateCollection = New-Object -TypeName 'System.Collections.Concurrent.BlockingCollection[object]'
 
 New-UDEndpoint -Id 'testdata' -Endpoint {
@@ -26,7 +27,7 @@ $Pages += New-UDPage -Name Button -Content {
     New-UDButton -Text "Click Me" -Id "button5" -OnClick {
         Set-TestData -Data $true
     }
-    New-UDButton -Text "Click Me" -Id button6 -Icon user
+    New-UDButton -Text "Click Me" -Id button6 -Icon user -IconAlignment right
     New-UDButton -Text "Click Me" -Id button7 -BackgroundColor red -FontColor black
 }
 
@@ -60,6 +61,32 @@ $Pages += New-UDPage -Name Card -Content {
     New-UDCard -Title "Test" -Text "Text" -Id "Card-Watermark" -Watermark address_book
 }
 
+$Pages += New-UDPage -Name 'Monitor' -Content {
+    New-UDMonitor -Title "DatagramsPersec" -Type Line -Width 20vw -Height 22vw -DataPointHistory 200 -RefreshInterval 1 -Endpoint {
+        Get-Random | Out-UDMonitorData
+      } -Options @{
+          scales = @{
+            yAxes = @(
+              @{
+                ticks = @{
+                  beginAtZero = $true
+                  min = 0
+                  max = [int]::MaxValue
+                }
+              }
+            )
+            xAxes = @(
+              @{
+                display = $false
+              }
+            )
+          }
+          legend = @{
+            display = $false
+          }
+        }
+}
+
 $Pages += New-UDPage -Name 'Checkbox' -Content {
     New-UDCheckbox -Id 'Test1' -Label 'Check me' -Checked 
     New-UDCheckbox -Id 'Test2' -Label 'Check me' -Disabled 
@@ -137,6 +164,10 @@ $Pages += New-UDPage -Name 'Column' -Content {
     }
 }
 
+$Pages += New-UDPage -Name 'Error' -Content {
+    throw "Exception"
+}
+
 $Pages += New-UDPage -Name 'Fab' -Content {
     New-UdFab -Id "main" -Icon "plus" -Size "large" -ButtonColor "red" -onClick {
         Set-TestData -Data "parent"
@@ -418,6 +449,87 @@ $Pages += New-UDPage -Name "Image Carousel" -Content {
 #>
 }
 
+$Pages += New-UDPage -Name 'Input1' -Endpoint {
+    New-UDInput -Title "Simple Form" -Id "Form1" -Content {
+        New-UDInputField -Name 'checkbox' -Type 'checkbox'
+        New-UDInputField -Name 'textbox' -Type 'textbox'
+    } -Endpoint {
+        param($checkbox, $textbox)
+
+        Set-TestData -Data @{
+            checkbox = $checkbox.GetType().Name
+            textbox = $textbox.GetType().Name 
+        }
+    }
+}
+
+$Pages += New-UDPage -Name 'Input2' -Endpoint {
+    New-UDInput -Title "Simple Form" -Id "Form2" -Endpoint {
+        New-UDInputAction -Content { New-UDElement -Tag 'div' -Id 'hello' }
+    }
+}
+
+$Pages += New-UDPage -Name 'Input3' -Endpoint {
+    New-UDInput -Title "Simple Form" -Id "Form3" -Content {
+        New-UDInputField -Type 'textbox' -Name 'test' -Placeholder 'Test testbox' -DefaultValue "Test"
+        New-UDInputField -Type 'checkbox' -Name 'test2' -Placeholder 'checkbox'
+        New-UDInputField -Type 'select' -Name 'test3' -Placeholder 'select' -Values @("Test", "Test2", "Test3") -DefaultValue "Test"
+        New-UDInputField -Type 'radioButtons' -Name 'test4' -Values @("MyTestValue", "MyTestValue2", "MyTestValue3")
+
+        New-UDInputField -Type 'password' -Name 'test5' -Placeholder 'Password'
+        New-UDInputField -Type 'textarea' -Name 'test6' -Placeholder 'Big Box o Text'
+        New-UDInputField -Type 'switch' -Name 'test7' -Placeholder @("Yes", "No")
+        New-UDInputField -Type 'select' -Name 'test8' -Placeholder 'select2'
+        New-UDInputField -Type 'date' -Name 'test9' -Placeholder 'My Time' 
+        New-UDInputField -Type 'time' -Name 'test10' -Placeholder 'My Date' 
+        New-UDInputField -Type 'radioButtons' -Name 'test11' -Values @("1", "2", "3")
+    } -Endpoint {
+        param($Test, $Test2, $Test3, $Test4, $Test5, $Test6, $Test7, $Test8, $Test9, $Test10, $test11)
+
+        Set-TestData @{
+            test = $test
+            test2 = $test2 
+            test3 = $test3
+            test4 = $test4
+            test5 = $test5
+            test6 = $test6
+            test7 = $test7
+            test8 = $test8
+            test9 = $test9
+            test10 = $test10
+            test11 = $test11
+        } 
+    } 
+
+}
+
+$Pages += New-UDPage -Name 'Input4' -Content {
+    New-UDInput -Title "Simple Form" -Id "Form4" -Endpoint {
+        param(
+            [Parameter(HelpMessage = "My Textbox")][string]$Textbox, 
+            [Parameter(HelpMessage = "My Checkbox")][bool]$Checkbox, 
+            [Switch]$Checkbox2, 
+            [Parameter(HelpMessage = "Day of the week")]
+            [System.DayOfWeek]$DayOfWeek,
+            [Parameter(HelpMessage = "Favorite Fruit")]
+            [ValidateSet("Banana", "Apple", "Grape")]$Fruit,
+            [Parameter()]
+            [System.Security.SecureString]$SecureString,
+            [Parameter()]
+            [String[]]$ArrayOfStrings)
+
+        Set-TestData @{
+            Textbox = $Textbox
+            Checkbox = $Checkbox 
+            Checkbox2= [bool]$Checkbox2
+            DayOfWeek = $DayOfWeek
+            Vals = $Vals
+            SecureString = $SecureString
+            Strings = $ArrayOfStrings
+        } 
+    }
+}
+
 $Pages += New-UDPage -Name "Layout" -Content {
     New-UDElement -Tag 'div' -Id layout1 -Content {
         New-UDLayout -Columns 3 -Content {
@@ -460,6 +572,12 @@ $Pages += New-UDPage -Name "Modal" -Content {
     }
 }
 
+$Pages += New-UDPage -Name 'Toast' -Content {
+    New-UDButton -Id 'button' -OnClick {
+        Show-UDToast -Message 'hello' -Icon 'user' -Duration 5000
+    }
+}
+
 $Pages += New-UDPage -Name "Preloader" -Content {
     New-UDPreloader
 }
@@ -494,6 +612,12 @@ $Pages += New-UDPage -Name "Row" -Content {
             New-UDElement -Id "hi2" -Tag "div"
         }
     }
+
+    New-UDRow -Id 'MyRow' -Columns {
+        New-UDColumn -Content {
+            New-UDElement -Id 'content' -Tag "div"
+        }
+    }
 }
 
 $Pages += New-UDPage -Name "Select" -Content {
@@ -563,4 +687,21 @@ $Pages += New-UDPage -Name "Tabs" -Content {
     }
 }
 
-New-UDDashboard -Title 'Test' -Pages $Pages
\ No newline at end of file
+$Pages += New-UDPage -Name "SingleItem" -Content {
+    New-UDParagraph -Text "Stuff"
+}
+
+$Footer = New-UDFooter -Copyright "Test" -Links @(
+    New-UDLink -Text "test"
+    New-UDLink -Text "test2"
+) 
+
+$Navigation = New-UDSideNav -Content {
+    New-UDSideNavItem -Text "Text" -Url "/Button" -Id 'sideNav1'
+    New-UDSideNavItem -Text "testpage" -PageName "testpage" -icon home -id 'sideNav4'
+    New-UDSideNavItem -Text "Text2" -Id 'sideNav2' -Children {
+        New-UDSideNavItem -Text "Text3" -Url "/Button" -Id 'sideNav3'
+    } 
+}
+
+New-UDDashboard -Title 'Test' -Pages $Pages -Footer $Footer -Navigation $Navigation
\ No newline at end of file
diff --git a/src/v2/Tests/footer.tests.ps1 b/src/v2/Tests/footer.tests.ps1
new file mode 100644
index 00000000..a9e66f71
--- /dev/null
+++ b/src/v2/Tests/footer.tests.ps1
@@ -0,0 +1,7 @@
+Enter-SeUrl "$Address/Test" -Target $Driver
+
+Describe "New-UDFooter" {
+    It "should have footer" {
+        Get-SeElement -Target $Driver -Id 'ud-footer' | should not be $null
+    }
+}
\ No newline at end of file
diff --git a/src/v2/Tests/input.tests.ps1 b/src/v2/Tests/input.tests.ps1
new file mode 100644
index 00000000..b2f476f7
--- /dev/null
+++ b/src/v2/Tests/input.tests.ps1
@@ -0,0 +1,280 @@
+Describe "New-UDInput" {
+    It "should set the correct types" {
+        Enter-SeUrl -Url "$Address/Test/Input1" -Target $Driver 
+
+        $Element = Find-SeElement -Id "textbox" -Target $Driver
+        Send-SeKeys -Element $Element -Keys "hello"
+
+        $Element = Find-SeElement -Id "checkbox" -Target $Driver
+        Invoke-SeClick -Element $Element -JavaScriptClick -Driver $Driver
+
+        $Button = Find-SeElement -Id "btnForm1" -Target $Driver
+
+        Invoke-SeClick $Button
+
+        Start-Sleep 2
+
+        $Data = Get-TestData
+
+        $Data.checkbox | Should be "Boolean"
+        $Data.textbox | should be "String"
+    }
+
+    It "should not spin forever if an item is dropped to the pipeline that isn't UDInputAction" {
+        Enter-SeUrl -Url "$Address/Test/Input2" -Target $Driver 
+        $Button = Find-SeElement -Id "btnForm2" -Target $Driver
+        Invoke-SeClick $Button
+        Find-SeElement -Id 'hello' -Target $Driver | should not be $null
+    }
+
+    Context "Test3" {
+        Enter-SeUrl -Url "$Address/Test/Input3" -Target $Driver 
+
+        It "should select date" {
+            $Element = Find-SeElement -Id "test9" -Target $Driver
+            $Element | Invoke-SeClick
+
+            Start-Sleep 1
+
+            $Element = Find-SeElement -TagName "button" -Target $Driver | Where-Object { $_.Text -eq "20" }
+            $Element | Invoke-SeClick
+
+            $Element = Find-SeElement -ClassName "datepicker-done" -Target $Driver
+            $Element | Invoke-SeClick
+
+            Start-Sleep 1
+
+            $Button = Find-SeElement -Id "btnForm3" -Target $Driver
+
+            Invoke-SeClick -Element $Button 
+
+            Start-Sleep 1
+
+            (Get-TestData).test9 | Should be ((Get-Date).ToString("20-MM-yyyy"))
+        }
+
+        It "should submit textarea" {
+            $Element = Find-SeElement -Name "test6" -Driver $Driver
+            Send-SeKeys -Element $Element -Keys "Hello!!!!!!!!!!!!!!!!!!!!!!!!!"
+
+            $Button = Find-SeElement -Id "btnForm3" -Driver $Driver
+
+            Invoke-SeClick -Element $Button 
+
+            Start-Sleep 1
+
+            (Get-TestData).test6 | Should be "Hello!!!!!!!!!!!!!!!!!!!!!!!!!"
+        }
+
+        It "should submit password" {
+            $Element = Find-SeElement -Name "test5" -Driver $Driver
+            Send-SeKeys -Element $Element -Keys "Hello"
+
+            $Button = Find-SeElement -Id "btnForm3" -Driver $Driver
+
+            Invoke-SeClick -Element $Button 
+
+            Start-Sleep 1
+
+            (Get-TestData).test5 | Should be "Hello"
+        }
+
+        It "should submit text" {
+            $Element = Find-SeElement -Name "test" -Driver $Driver
+            Send-SeKeys -Element $Element -Keys "Hello"
+
+            $Button = Find-SeElement -Id "btnForm3" -Driver $Driver
+
+            Invoke-SeClick -Element $Button 
+
+            Start-Sleep 1
+
+            (Get-TestData).test | Should be "TestHello"
+        }
+
+        It "should output bool" {
+            $Element = Find-SeElement -Id "test2" -Driver $Driver
+            Invoke-SeClick -Element $Element -JavaScriptClick -Driver $Driver
+
+            $Button = Find-SeElement -Id "btnForm3" -Driver $Driver
+            Invoke-SeClick -Element $Button 
+
+            Start-Sleep 1
+
+            (Get-TestData).test2 | Should be "true"
+        }
+
+        It "should selected default value" {
+            $Button = Find-SeElement -Id "btnForm3" -Driver $Driver
+            Invoke-SeClick -Element $Button 
+
+            Start-Sleep 1
+
+            (Get-TestData).test3 | Should be "Test"
+        }
+
+
+        It "should selected value" {
+            $Element = Find-SeElement -ClassName "select-wrapper" -Driver $Driver | Select -First 1
+            Invoke-SeClick -Element $Element
+
+            $Element = Find-SeElement -XPath "//ul/li" -Element $Element | Select-Object -Skip 1 -First 1
+            Invoke-SeClick -Element $Element -JavaScriptClick -Driver $Driver
+
+            $Button = Find-SeElement -Id "btnForm3" -Driver $Driver
+            Invoke-SeClick -Element $Button 
+
+            Start-Sleep 1
+
+            (Get-TestData).test3 | Should be "Test"
+        }
+
+        
+        It "should select radio button" {
+            $Element = Find-SeElement -TagName "label" -Driver $Driver | Where-Object { (Get-SeElementAttribute $_ -Attribute "for") -eq 'Form3test40' }
+            Invoke-SeClick -Element $Element -JavaScriptClick -Driver $Driver
+
+            $Button = Find-SeElement -Id "btnForm3" -Driver $Driver
+            Invoke-SeClick -Element $Button 
+
+            Start-Sleep 1
+
+            (Get-TestData).test4 | Should be "MyTestValue"
+        }
+
+        It "should select second radio button" {
+            $Element = Find-SeElement -TagName "label" -Driver $Driver | Where-Object { (Get-SeElementAttribute $_ -Attribute "for") -eq 'Form3test110' }
+            Invoke-SeClick -Element $Element -JavaScriptClick -Driver $Driver
+
+            $Button = Find-SeElement -Id "btnForm3" -Driver $Driver
+            Invoke-SeClick -Element $Button 
+
+            Start-Sleep 1
+
+            (Get-TestData).test11 | Should be "1"
+        }
+
+        It "should switch the switch" {
+            $Element = Find-SeElement -Id "test7" -Driver $Driver
+            Invoke-SeClick -Element $Element -JavaScriptClick -Driver $Driver
+
+            $Button = Find-SeElement -Id "btnForm3" -Driver $Driver
+            Invoke-SeClick -Element $Button 
+
+            Start-Sleep 1
+
+            (Get-TestData).test7 | Should be "true"
+        }
+    }
+
+    Context "Test4" {
+        Enter-SeUrl -Url "$Address/Test/Input4" -Target $Driver
+
+        It "should output text" {
+            $Element = Find-SeElement -Name "Textbox" -Driver $Driver
+            Send-SeKeys -Element $Element -Keys "Hello"
+
+            $Button = Find-SeElement -Id "btnForm4" -Driver $Driver
+
+            Invoke-SeClick -Element $Button 
+
+            Start-Sleep 2
+
+            Wait-Debugger
+
+            (Get-TestData).Textbox | Should be "Hello"
+        }
+
+        It "should have friendly label for textbox" {
+            $Element = Find-SeElement -TagName "label" -Driver $Driver | Where-Object { $_.Text -eq 'My Textbox' }
+            $Element | Should not be $null
+        }
+
+        It "should have friendly label for checkbox" {
+            $Element = Find-SeElement -TagName 'label' -Driver $Driver | Where-Object { (Get-SeElementAttribute $_ -Attribute "for") -eq "Checkbox" }
+            $Element.Text | Should be "My Checkbox"
+        }
+        
+        It "should output bool" {
+            $Element = Find-SeElement -id "Checkbox" -Driver $Driver
+            Invoke-SeClick -Element $Element -JavaScriptClick -Driver $Driver
+
+            $Button = Find-SeElement -Id "btnForm4" -Driver $Driver
+            Invoke-SeClick -Element $Button 
+
+            Start-Sleep 1
+
+            (Get-TestData).Checkbox | Should be "true"
+        }
+
+        It "should output switch" {
+            $Element = Find-SeElement -id "Checkbox2" -Driver $Driver
+            Invoke-SeClick -Element $Element -JavaScriptClick -Driver $Driver
+
+            $Button = Find-SeElement -Id "btnForm4" -Driver $Driver
+            Invoke-SeClick -Element $Button 
+
+            Start-Sleep 1
+
+            (Get-TestData).Checkbox2 | Should be "true"
+        }
+
+        It "should output day of week" {
+            $Element = Find-SeElement -ClassName "select-wrapper" -Driver $Driver | Select -First 1
+            Invoke-SeClick -Element $Element
+
+            $Element = Find-SeElement -XPath "//ul/li" -Element $Element | Select-Object -Skip 1 -First 1
+            Invoke-SeClick -Element $Element
+
+            $Button = Find-SeElement -Id "btnForm4" -Driver $Driver
+            Invoke-SeClick -Element $Button 
+
+            Start-Sleep 1
+
+            (Get-TestData).DayOfWeek | Should be "Monday"
+        }
+
+        It "should output vals" {
+            return
+            $Element = Find-SeElement -ClassName "select-wrapper" -Driver $Driver | Select -Skip 1 -First 1
+            Invoke-SeClick -Element $Element
+
+            $Element = Find-SeElement -XPath "//ul/li" -Element $Element | Select-Object -Skip 2 -First 1
+            Invoke-SeClick -Element $Element
+
+            $Button = Find-SeElement -Id "btnForm4" -Driver $Driver
+            Invoke-SeClick -Element $Button 
+
+            Start-Sleep 1
+
+            (Get-TestData).Vals | Should be "Apple"
+        }
+
+        
+        It "should output secure string" {
+            $Element = Find-SeElement -Id "SecureString" -Driver $Driver 
+            Send-SeKeys -Element $Element -Keys "password"
+
+            $Button = Find-SeElement -Id "btnForm4" -Driver $Driver
+            Invoke-SeClick -Element $Button 
+
+            Start-Sleep 1
+
+            (Get-TestData).SecureString -is [System.Security.SecureString] | Should be $true
+        }
+
+        It "should output string array" {
+            $Element = Find-SeElement -Id "ArrayOfStrings" -Driver $Driver 
+            Send-SeKeys -Element $Element -Keys "1`r`n2`r`n3"
+
+            $Button = Find-SeElement -Id "btnForm4" -Driver $Driver
+            Invoke-SeClick -Element $Button 
+
+            Start-Sleep 1
+
+            (Get-TestData).Strings[0] | Should be "1"
+            (Get-TestData).Strings[1] | Should be "2"
+            (Get-TestData).Strings[2] | Should be "3"
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/v2/Tests/monitor.tests.ps1 b/src/v2/Tests/monitor.tests.ps1
new file mode 100644
index 00000000..601d3878
--- /dev/null
+++ b/src/v2/Tests/monitor.tests.ps1
@@ -0,0 +1,6 @@
+Enter-SeUrl -Url "$Address/Test/Monitor" -Target $Driver
+
+Describe "New-UDMonitor" {
+    It "should hide x axis" {
+    }
+}
\ No newline at end of file
diff --git a/src/v2/Tests/page.tests.ps1 b/src/v2/Tests/page.tests.ps1
new file mode 100644
index 00000000..4902c87a
--- /dev/null
+++ b/src/v2/Tests/page.tests.ps1
@@ -0,0 +1,9 @@
+Describe "Page" {
+    It "should have an error" {
+        Enter-SeUrl "$Address/Test/Error" -Target $Driver
+    }
+
+    It "should have a single item" {
+        Enter-SeUrl "$Address/Test/SingleItem" -Target $Driver
+    }
+}
\ No newline at end of file
diff --git a/src/v2/Tests/row.tests.ps1 b/src/v2/Tests/row.tests.ps1
index 98bdb4d8..40e2f0e4 100644
--- a/src/v2/Tests/row.tests.ps1
+++ b/src/v2/Tests/row.tests.ps1
@@ -8,4 +8,8 @@ Describe "New-UDRow" {
     It "should have content" {
         Find-SeElement -Id "hi2" -Driver $Driver | Should not be $null
     }
+
+    It "should have an ID" {
+        Find-SeElement -Id "MyRow" -Driver $Driver | Should not be $null
+    }
 }
\ No newline at end of file
diff --git a/src/v2/Tests/sidenav.tests.ps1 b/src/v2/Tests/sidenav.tests.ps1
new file mode 100644
index 00000000..95bbdb98
--- /dev/null
+++ b/src/v2/Tests/sidenav.tests.ps1
@@ -0,0 +1,10 @@
+Enter-SeUrl -Url "$Address/Test/Switch" -Target $Driver
+
+Describe "New-UDSideNav" {
+    It "should have a side nav" {
+        Find-SeElement -Id 'sideNav1' -Target $Driver | should not be $null
+        Find-SeElement -Id 'sideNav2' -Target $Driver | should not be $null
+        Find-SeElement -Id 'sideNav3' -Target $Driver | should not be $null
+        Find-SeElement -Id 'sideNav4' -Target $Driver | should not be $null
+    }
+}
\ No newline at end of file
diff --git a/src/v2/Tests/toast.tests.ps1 b/src/v2/Tests/toast.tests.ps1
new file mode 100644
index 00000000..e3dfdf9d
--- /dev/null
+++ b/src/v2/Tests/toast.tests.ps1
@@ -0,0 +1,8 @@
+Enter-SeUrl "$Address/Test/Toast" -Target $Driver
+
+Describe 'toast' {
+    It "should show toast icon" {
+        Find-SeElement -Id 'button' -Target $Driver | Invoke-SeClick 
+        Find-SeElement -Id 'Toast' -Target $Driver
+    }
+}
\ No newline at end of file
diff --git a/src/v2/UniversalDashboard.Materialize.psm1 b/src/v2/UniversalDashboard.Materialize.psm1
index 5582e61f..a86eb5bf 100644
--- a/src/v2/UniversalDashboard.Materialize.psm1
+++ b/src/v2/UniversalDashboard.Materialize.psm1
@@ -1,8 +1,7 @@
 $TAType = [psobject].Assembly.GetType('System.Management.Automation.TypeAccelerators')
 $TAtype::Add('DashboardColor', 'UniversalDashboard.Models.DashboardColor')
 $TAtype::Add('Endpoint', 'UniversalDashboard.Models.Endpoint')
-
-
+$TAtype::Add('FontAwesomeIcons', 'UniversalDashboard.Models.FontAwesomeIcons')
 
 function Find-Object {
     param(
@@ -121,7 +120,9 @@ function Out-UDChartData {
 		[Parameter()]
 		[UniversalDashboard.Models.DashboardColor[]]$HoverBackgroundColor = @("#807B210C"),
 		[Parameter()]
-		[UniversalDashboard.Models.DashboardColor[]]$HoverBorderColor = @("#FF7B210C")
+		[UniversalDashboard.Models.DashboardColor[]]$HoverBorderColor = @("#FF7B210C"),
+		[Parameter()]
+		[int[]]$BorderWidth
 	)
 
     Begin {
@@ -149,7 +150,7 @@ function Out-UDChartData {
 					borderColor = $BorderColor.HtmlColor
 					hoverBackgroundColor = $HoverBackgroundColor.HtmlColor
 					hoverBorderColor = $HoverBorderColor.HtmlColor
-					borderWidth = 1
+					borderWidth = $BorderWidth
 					data = @($Items | ForEach-Object { $_.$DataProperty })
 				}
 		}
diff --git a/src/v2/app/basics/lazy-element.jsx b/src/v2/app/basics/lazy-element.jsx
index 95162253..d8eb04ea 100644
--- a/src/v2/app/basics/lazy-element.jsx
+++ b/src/v2/app/basics/lazy-element.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {getApiPath, getDashboardId} from './../config.jsx'
+import {getApiPath} from './../config.jsx'
 import renderComponent from './../services/render-service.jsx';
 
 export default class LazyElement extends React.Component {
@@ -12,12 +12,11 @@ export default class LazyElement extends React.Component {
         }
     }
     componentWillMount() {
-        const dashboardId = getDashboardId();
         var script = document.createElement('script');
         script.onload = function() {
             this.setState({loading:false});
         }.bind(this)
-        script.src = getApiPath() + `/api/internal/javascript/${this.props.component.assetId}?dashboardId=${dashboardId}`;
+        script.src = getApiPath() + "/" + this.props.component.assetId;
         document.head.appendChild(script); 
     }
 
diff --git a/src/v2/app/ud-dashboard.jsx b/src/v2/app/ud-dashboard.jsx
index 25de34fa..e04fcb6e 100644
--- a/src/v2/app/ud-dashboard.jsx
+++ b/src/v2/app/ud-dashboard.jsx
@@ -3,12 +3,12 @@ import React, { Suspense, useState, useEffect } from 'react';
 import { getApiPath, getDashboardId } from './config.jsx';
 import { fetchGet } from './services/fetch-service.jsx';
 import PubSub from 'pubsub-js';
-import { HubConnectionBuilder, LogLevel, HttpTransportType } from '@microsoft/signalr';
+import { HubConnectionBuilder, LogLevel } from '@microsoft/signalr';
 
 import toaster from './services/toaster';
-import LazyElement from './basics/lazy-element.jsx';
 import copy from 'copy-to-clipboard'
 import ErrorCard from './../Components/error-card';
+import useErrorBoundary from 'use-error-boundary';
 
 var connection;
 
@@ -231,9 +231,9 @@ function getLocation(setLocation) {
 }
 
 function Dashboard({ history }) {
+    const { ErrorBoundary, didCatch, error } = useErrorBoundary()
     const [dashboard, setDashboard] = useState(null);
-    const [hasError, setHasError] = useState(false);
-    const [error, setError] = useState(null);
+    const [dashboardError, setDashboardError] = useState(null);
     const [loading, setLoading] = useState(true);
     const [location, setLocation] = useState(null);
 
@@ -243,8 +243,7 @@ function Dashboard({ history }) {
             var dashboard = json.dashboard;
     
             if (dashboard.error) {
-                setError(dashboard.error);
-                setHasError(true);
+                setDashboardError(dashboard.error);
                 return;
             }
     
@@ -283,16 +282,20 @@ function Dashboard({ history }) {
             loadData()
         }
         catch (err) {
-            setError(err);
-            setHasError(true);
+            setDashboardError(err);
         }
     });
 
-    if (hasError)
+    if (didCatch)
     {
         return <ErrorCard message={error}/>
     }
 
+    if (dashboardError)
+    {
+        return <ErrorCard message={dashboardError}/>
+    }
+
     if (loading) {
         return <div />
     }
@@ -305,11 +308,13 @@ function Dashboard({ history }) {
 
         var pluginComponents = UniversalDashboard.provideDashboardComponents();
 
-        return  [component, pluginComponents]
+        return <ErrorBoundary>
+            {component}
+            {pluginComponents}
+        </ErrorBoundary>
     }
     catch (err) {
-        setError(err);
-        setHasError(true);
+        setDashboardError(err);
     }
 
     return null;
diff --git a/src/v2/package-lock.json b/src/v2/package-lock.json
index b531bbe6..60fe97ca 100644
--- a/src/v2/package-lock.json
+++ b/src/v2/package-lock.json
@@ -11661,6 +11661,27 @@
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
       "dev": true
     },
+    "use-error-boundary": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/use-error-boundary/-/use-error-boundary-1.2.3.tgz",
+      "integrity": "sha512-RRgZmkY2rySvxP7R6wrPCjq5YjKJnfyhu5chzQUGsTmEddIq3RJdYfmsEq79QoDOQEAF+YWkf7PwqBcAFGFKAw==",
+      "requires": {
+        "prop-types": "^15.7.2",
+        "react": "^16.8.6"
+      },
+      "dependencies": {
+        "prop-types": {
+          "version": "15.7.2",
+          "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+          "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+          "requires": {
+            "loose-envify": "^1.4.0",
+            "object-assign": "^4.1.1",
+            "react-is": "^16.8.1"
+          }
+        }
+      }
+    },
     "util": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
diff --git a/src/v2/package.json b/src/v2/package.json
index b3d84bda..4e12d8cf 100644
--- a/src/v2/package.json
+++ b/src/v2/package.json
@@ -11,48 +11,49 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@microsoft/signalr": "3.1.3",
     "@fortawesome/fontawesome-svg-core": "^1.2.17",
     "@fortawesome/free-brands-svg-icons": "5.8.1",
     "@fortawesome/free-regular-svg-icons": "^5.8.1",
     "@fortawesome/free-solid-svg-icons": "5.8.1",
     "@fortawesome/react-fontawesome": "^0.1.4",
-    "copy-to-clipboard": "^3.2.0",
-    "core-js": "^3.6.1",
     "@material/tab": "^4.0.0",
     "@material/tab-bar": "^4.0.0",
     "@material/tab-indicator": "^4.0.0",
     "@material/tab-scroller": "^4.0.0",
+    "@microsoft/signalr": "3.1.3",
     "@rmwc/tabs": "^5.7.2",
     "@rmwc/toolbar": "^5.7.2",
     "chart.js": "2.9.3",
     "classnames": "^2.2.6",
     "clipboard-polyfill": "^2.8.6",
+    "copy-to-clipboard": "^3.2.0",
+    "core-js": "^3.6.1",
     "glamor-jss": "^1.4.1",
     "griddle-react": "1.13.1",
+    "izitoast": "1.3.0",
     "jquery": "^3.5.0",
     "js-cookie": "2.2.1",
     "material-components-web": "^4.0.0",
     "materialize-css": "1.0.0",
     "moment": "2.24.0",
     "numeral": "2.0.6",
+    "promise-polyfill": "8.1.3",
+    "pubsub-js": "1.8.0",
+    "react": "16.12.0",
     "react-chartjs-2": "2.8.0",
     "react-debounce-input": "3.2.2",
     "react-dom": "^16.12.0",
     "react-grid-layout": "^0.17.1",
     "react-interval": "^2.1.1",
     "react-materialize": "^3.5.8",
-    "react-treebeard": "^2.1.0",
-    "styled-components": "^4.4.1",
-    "terminal-in-react": "^4.3.1",
-    "izitoast": "1.3.0",
-    "promise-polyfill": "8.1.3",
-    "pubsub-js": "1.8.0",
-    "react": "16.12.0",
+    "react-router-dom": "5.1.2",
     "react-spinkit": "^3.0.0",
     "react-split-pane": "^0.1.87",
     "react-tooltip": "^3.11.1",
-    "react-router-dom": "5.1.2"
+    "react-treebeard": "^2.1.0",
+    "styled-components": "^4.4.1",
+    "terminal-in-react": "^4.3.1",
+    "use-error-boundary": "^1.2.3"
   },
   "devDependencies": {
     "@babel/core": "7.7.7",
diff --git a/src/v2/tests.build.ps1 b/src/v2/tests.build.ps1
index 941b434a..c258f65e 100644
--- a/src/v2/tests.build.ps1
+++ b/src/v2/tests.build.ps1
@@ -1,15 +1,11 @@
 param($Script)
 
 Import-Module Selenium
-Import-Module Universal -Scope Global
-Import-Module "$PSScriptRoot\output\*.psd1" -Scope Global
-
 
 $OutputPath = "$PSScriptRoot\..\..\output"
 $Address = 'http://localhost:5000'
 
 task Clean {
-   # Remove-Item $OutputPath -Force -Recurse
     Remove-Item "$Env:ProgramData\UniversalAutomation" -Force -Recurse -ErrorAction SilentlyContinue
     Remove-Item "$Env:ProgramData\PowerShellUniversal" -Force -Recurse -ErrorAction SilentlyContinue
 }
diff --git a/src/v3/Components/button.jsx b/src/v3/Components/button.jsx
index ade7645b..adf65830 100644
--- a/src/v3/Components/button.jsx
+++ b/src/v3/Components/button.jsx
@@ -46,7 +46,7 @@ const UdButton = props => {
       href={props.href}
       onClick={handleClick}
       style={{ ...props.style }}
-      //sx={{ bg: 'primary', color: 'text' }}
+      sx={{ bg: 'primary', color: 'text' }}
       id={props.id}
     >
       {props.iconAlignment === 'left' ? icon : null}
diff --git a/src/v3/Components/expansion-panel.jsx b/src/v3/Components/expansion-panel.jsx
index 2712c27f..7a2609d5 100644
--- a/src/v3/Components/expansion-panel.jsx
+++ b/src/v3/Components/expansion-panel.jsx
@@ -39,9 +39,17 @@ function UDExpansionPanel(props) {
 
 export default function ExpansionPanelGroup(props) {
     const classes = useStyles();
-    
-    var children = props.children.map(x => <UDExpansionPanel {...x} />);
 
+    var children = null;
+    if (Array.isArray(props.children))
+    {
+        children = props.children.map(x => <UDExpansionPanel {...x} />);
+    }
+    else 
+    {
+        children = <UDExpansionPanel {...props.children} />
+    }
+    
     return (
         <div className={classes.root}>
             {children}
diff --git a/src/v3/Components/paper.jsx b/src/v3/Components/paper.jsx
index 7f3d975c..b4e2af76 100644
--- a/src/v3/Components/paper.jsx
+++ b/src/v3/Components/paper.jsx
@@ -36,7 +36,7 @@ const UdPaper = (props) => {
       height={height}
       width={width}
       square={square}  
-      //sx={{ bg: 'primary', color: 'text'}}
+      sx={{ bg: 'primary', color: 'text'}}
     >
       {props.render(props.children)}
     </Paper>
diff --git a/src/v3/Scripts/container.ps1 b/src/v3/Scripts/container.ps1
index b1fd17c6..77451b30 100644
--- a/src/v3/Scripts/container.ps1
+++ b/src/v3/Scripts/container.ps1
@@ -9,6 +9,13 @@ function New-UDContainer
         [ScriptBlock]$Children        
     )
 
+    try {
+        $c = & $Children    
+    }
+    catch {
+        $c = New-UDError -Message $_
+    }
+    
     Process {
         @{
             isPlugin = $true 
@@ -16,7 +23,7 @@ function New-UDContainer
             assetId = $MUAssetId
             type = "mu-container"
 
-            children = . $Children
+            children = $c
         }
     }
 }
\ No newline at end of file
diff --git a/src/v3/Scripts/drawer.ps1 b/src/v3/Scripts/drawer.ps1
index 0c07237f..7182fea8 100644
--- a/src/v3/Scripts/drawer.ps1
+++ b/src/v3/Scripts/drawer.ps1
@@ -40,11 +40,17 @@ function New-UDDrawer
         [ScriptBlock]$Children
     )
 
+    try {
+        $c = & $Children
+    } catch {
+        $c = New-UDError -Message $_
+    }
+
     @{
         type = 'mu-drawer'
         id = $Id 
         isPlugin = $true 
         assetId = $MUAssetId
-        children = & $Children
+        children = $c
     }
 }
\ No newline at end of file
diff --git a/src/v3/Scripts/dynamic.ps1 b/src/v3/Scripts/dynamic.ps1
index 64f134ac..e435492b 100644
--- a/src/v3/Scripts/dynamic.ps1
+++ b/src/v3/Scripts/dynamic.ps1
@@ -15,8 +15,6 @@ function New-UDDynamic
         [ScriptBlock]$LoadingComponent = {}
     )
 
-    Write-Debug "UDynamic: $id"
-
     $Content.Register($Id, $PSCmdlet)
 
     @{
@@ -25,6 +23,6 @@ function New-UDDynamic
         autoRefreshInterval = $AutoRefreshInterval
         type = "dynamic"
         isPlugin = $true 
-        loadingComponent = . $LoadingComponent
+        loadingComponent = & $LoadingComponent
     }
 }
\ No newline at end of file
diff --git a/src/v3/Scripts/error.ps1 b/src/v3/Scripts/error.ps1
new file mode 100644
index 00000000..05eca4f6
--- /dev/null
+++ b/src/v3/Scripts/error.ps1
@@ -0,0 +1,17 @@
+function New-UDError {
+    param(
+        [Parameter(Mandatory)]
+        [string]$Message,
+        [Parameter()]
+        [string]$Title
+    )
+
+    @{
+        type = "error"
+        isPlugin = $true 
+        assetId = $AssetId 
+
+        errorRecords = @(@{message= $Message})
+        title = $Title
+    }
+}
\ No newline at end of file
diff --git a/src/v3/Scripts/expansion-panel.ps1 b/src/v3/Scripts/expansion-panel.ps1
index 0752b086..3f103e99 100644
--- a/src/v3/Scripts/expansion-panel.ps1
+++ b/src/v3/Scripts/expansion-panel.ps1
@@ -47,13 +47,20 @@ function New-UDExpansionPanelGroup {
         [String]$Type = 'Expandable'
     )
 
+    try {
+        $c = & $Children
+    }
+    catch {
+        $c = New-UDError -Message $_
+    }
+
     @{
         type = 'mu-expansion-panel-group'
         isPlugin = $true
         assetId = $AssetId
 
         id = $id
-        children = & $Children
+        children = $c
         popout = $Popout.IsPresent
         accordion = $Type -eq 'Accordion'
     }
diff --git a/src/v3/Scripts/form.ps1 b/src/v3/Scripts/form.ps1
index e011e575..0ff0c83a 100644
--- a/src/v3/Scripts/form.ps1
+++ b/src/v3/Scripts/form.ps1
@@ -76,6 +76,13 @@ function New-UDForm
 
     $OnSubmit.Register($id, $PSCmdlet)
 
+    try {
+        $c = & $Children 
+    }
+    catch {
+        $c = New-UDError -Message $_
+    }
+
     @{
         id = $Id 
         assetId = $MUAssetId 
@@ -85,7 +92,7 @@ function New-UDForm
         onSubmit = $OnSubmit 
         onValidate = $OnValidate
         loadingComponent = $LoadingComponent
-        children = & $Children
+        children = $c
     }
 }
 
diff --git a/src/v3/Scripts/grid.ps1 b/src/v3/Scripts/grid.ps1
index 5ca0f44e..ac39ce1b 100644
--- a/src/v3/Scripts/grid.ps1
+++ b/src/v3/Scripts/grid.ps1
@@ -73,6 +73,13 @@ function New-UDGrid {
     )
 
     End {
+        try {
+            $c = & $Children
+        }
+        catch {
+            $c = New-UDError -Message $_
+        }
+
         @{
             id = $Id 
             isPlugin = $true 
@@ -89,7 +96,7 @@ function New-UDGrid {
             container = $Container.IsPresent
             item = $Item.IsPresent
 
-            children = & $Children
+            children = $c
         }
     }
 }
\ No newline at end of file
diff --git a/src/v3/Scripts/list.ps1 b/src/v3/Scripts/list.ps1
index fac880df..4706269f 100644
--- a/src/v3/Scripts/list.ps1
+++ b/src/v3/Scripts/list.ps1
@@ -39,13 +39,20 @@ function New-UDList {
     )
     End
     {
+        try {
+            $c = & $Children
+        }
+        catch {
+            $c = New-UDError -Message $_
+        }
+
         @{
             type = 'mu-list'
             isPlugin = $true
             assetId = $MUAssetId
 
             id = $Id
-            children = & $Children
+            children = $c
             subHeader = $SubHeader
             style = $Style
         }
@@ -163,7 +170,13 @@ function New-UDListItem {
         }
 
         if($null -ne $Children){
-            $CardContent = &$Children
+            try {
+                $CardContent = & $Children    
+            }
+            catch {
+                $CardContent = New-UDError -Message $_
+            }
+            
         }else{
             $CardContent = $null
         }
diff --git a/src/v3/Scripts/page.ps1 b/src/v3/Scripts/page.ps1
index 6692f778..80a49dfe 100644
--- a/src/v3/Scripts/page.ps1
+++ b/src/v3/Scripts/page.ps1
@@ -34,7 +34,7 @@ function New-UDPage
 
     if ($OnLoading)
     {
-        $LoadingContent = . $OnLoading
+        $LoadingContent = & $OnLoading
     }
     
 
diff --git a/src/v3/Scripts/paper.ps1 b/src/v3/Scripts/paper.ps1
index cb3b53df..319c0689 100644
--- a/src/v3/Scripts/paper.ps1
+++ b/src/v3/Scripts/paper.ps1
@@ -51,6 +51,12 @@ function New-UDPaper {
 
     End 
     {
+        try {
+            $c = & $Children
+        }
+        catch {
+            $c = New-UDError -Message $_
+        }
         @{
             type = 'mu-paper'
             isPlugin = $true
@@ -58,7 +64,7 @@ function New-UDPaper {
             
             id = $Id
             width  = $Width 
-            children = & $Children
+            children = $c
             height = $Height
             square = $Square.IsPresent
             style = $Style
diff --git a/src/v3/Scripts/splitpane.ps1 b/src/v3/Scripts/splitpane.ps1
index c56ad9e4..21106447 100644
--- a/src/v3/Scripts/splitpane.ps1
+++ b/src/v3/Scripts/splitpane.ps1
@@ -13,7 +13,12 @@ function New-UDSplitPane {
         [int]$DefaultSize
     )
 
-    $Children = & $Content
+    try {
+        $Children = & $Content
+    }
+    catch {
+        $Children = New-UDError -Message $_
+    }
 
     if ($Children.Length -ne 2) {
         Write-Error "Split pane requires exactly two components in Content"
diff --git a/src/v3/Scripts/stepper.ps1 b/src/v3/Scripts/stepper.ps1
index e883d6ef..7fac8323 100644
--- a/src/v3/Scripts/stepper.ps1
+++ b/src/v3/Scripts/stepper.ps1
@@ -78,6 +78,12 @@ function New-UDStepper {
         $OnValidateStep.Register($Id + "onValidate", $PSCmdlet)
     }
 
+    try {
+        $c = & $Children
+    } catch {
+        $c = New-UDError -Message $_
+    }
+
 
     @{
         id = $id 
@@ -85,7 +91,7 @@ function New-UDStepper {
         type = 'mu-stepper'
         assetId = $MUAssetId 
 
-        children = & $Children
+        children = $c
         nonLinear = $NonLinear.IsPresent 
         alternativeLabel = $AlternativeLabel.IsPresent
         onFinish = $OnFinish
diff --git a/src/v3/Scripts/tabs.ps1 b/src/v3/Scripts/tabs.ps1
index acb98d6e..a35ff52d 100644
--- a/src/v3/Scripts/tabs.ps1
+++ b/src/v3/Scripts/tabs.ps1
@@ -77,11 +77,19 @@ function New-UDTabs {
     )
 
     End {
+
+        try {
+            $c = & $Tabs 
+        }
+        catch {
+            $c = New-UDError -Message $_
+        }
+
         @{
             isPlugin        = $true
             assetId         = $MUAssetId
             type            = "mu-tabs"
-            tabs            = $Tabs.Invoke()
+            tabs            = $c
             id              = $id
             renderOnClick   = $RenderOnActive.IsPresent
             orientation     = $Orientation
@@ -112,13 +120,19 @@ function New-UDTab {
             New-UDEndpoint -Id $Id -Endpoint $Content | Out-Null
         }
 
+        try {
+            $c = & $Content 
+        } catch {
+            $c = New-UDError -Message $_
+        }
+
         @{
             isPlugin = $true
             assetId  = $MUAssetId
             type     = "mu-tab"
             label     = $Text
             icon = $Icon
-            content  = $Content.Invoke()
+            content  = $c
             id       = $Id
             stacked = $Stacked.IsPresent
             dynamic = $Dynamic.IsPresent
diff --git a/src/v3/Tests/expansion-panel.tests.ps1 b/src/v3/Tests/expansion-panel.tests.ps1
index 81c88175..0c7d7132 100644
--- a/src/v3/Tests/expansion-panel.tests.ps1
+++ b/src/v3/Tests/expansion-panel.tests.ps1
@@ -10,4 +10,9 @@ Describe "expansion panel" {
         Find-SeElement -Id 'expContent' -Driver $Driver | Select-Object -First 1 | Invoke-SeClick
         (Find-SeElement -Id 'expContentDiv' -Driver $Driver).Text | Should be "Hello"
     }
+
+    It 'works with one expansion panel' {
+        Find-SeElement -Id 'expContent2' -Driver $Driver | Select-Object -First 1 | Invoke-SeClick
+        (Find-SeElement -Id 'expContentDiv2' -Driver $Driver).Text | Should be "Hello"
+    }
 }
\ No newline at end of file
diff --git a/src/v3/app/ud-dashboard.jsx b/src/v3/app/ud-dashboard.jsx
index 1f2a6d13..bbee9262 100644
--- a/src/v3/app/ud-dashboard.jsx
+++ b/src/v3/app/ud-dashboard.jsx
@@ -9,6 +9,7 @@ import { base } from '@theme-ui/presets'
 import toaster from './services/toaster'
 import copy from 'copy-to-clipboard'
 import ErrorCard from './../Components/framework/error-card'
+import useErrorBoundary from 'use-error-boundary';
 
 const dashboardId = getDashboardId();
 
@@ -250,9 +251,9 @@ function getLocation(setLocation) {
 }
 
 function Dashboard({ history }) {
+  const { ErrorBoundary, didCatch, error } = useErrorBoundary()
   const [dashboard, setDashboard] = useState(null)
-  const [hasError, setHasError] = useState(false)
-  const [error, setError] = useState(null)
+  const [dashboardError, setDashboardError] = useState(null)
   const [loading, setLoading] = useState(true)
   const [location, setLocation] = useState(null)
 
@@ -263,8 +264,7 @@ function Dashboard({ history }) {
         var dashboard = json.dashboard
 
         if (dashboard.error) {
-          setError(dashboard.error);
-          setHasError(true);
+          setDashboardError(dashboard.error);
           return;
         }
 
@@ -296,12 +296,16 @@ function Dashboard({ history }) {
     try {
       loadData()
     } catch (err) {
-      setError(err)
-      setHasError(true)
+      setDashboardError(err)
     }
   })
 
-  if (hasError) {
+  if (didCatch)
+  {
+      return <ErrorCard errorRecords={[{message: error}]}/>
+  }
+
+  if (dashboardError) {
     return <ErrorCard errorRecords={[{message: error}]} />
   }
 
@@ -347,13 +351,14 @@ function Dashboard({ history }) {
     // }
     
     return (
-      <ThemeProvider theme={theme}>
-        <ColorModeProvider>{[component, pluginComponents]}</ColorModeProvider>
-      </ThemeProvider>
+      <ErrorBoundary>
+        <ThemeProvider theme={theme}>
+          <ColorModeProvider>{[component, pluginComponents]}</ColorModeProvider>
+        </ThemeProvider>
+      </ErrorBoundary>
     )
   } catch (err) {
-    setError(err)
-    setHasError(true)
+    setDashboardError(err)
   }
 
   return null
diff --git a/src/v3/build.ps1 b/src/v3/build.ps1
index eef1ac6a..8a7d1d44 100644
--- a/src/v3/build.ps1
+++ b/src/v3/build.ps1
@@ -5,6 +5,7 @@ task Stage {
         Get-Content $_.FullName -Raw | Out-File "$PSScriptRoot\output\UniversalDashboard.MaterialUI.psm1" -Append -Encoding UTF8
     }
     Copy-Item "$PSScriptRoot\UniversalDashboard.psd1" "$PSScriptRoot\output" 
+    Copy-Item "$PSScriptRoot\example.ps1" "$PSScriptRoot\output" 
 
     Pop-Location
 }
diff --git a/src/v3/dashboard.ps1 b/src/v3/dashboard.ps1
index e7d5427c..de9b8dca 100644
--- a/src/v3/dashboard.ps1
+++ b/src/v3/dashboard.ps1
@@ -288,6 +288,12 @@ New-UDDashboard -Title "Dashboard" -Pages @(
                 New-UDElement -Tag 'div' -id 'expContentDiv' -Content { "Hello" }
             }
         }
+
+        New-UDExpansionPanelGroup -Children {
+            New-UDExpansionPanel -Title "Hello" -Id 'expContent2' -Children {
+                New-UDElement -Tag 'div' -id 'expContentDiv2' -Content { "Hello" }
+            }
+        }
     }
 
     New-UDPage -Name 'Typography' -Content {
diff --git a/src/v3/example.ps1 b/src/v3/example.ps1
new file mode 100644
index 00000000..d05f6c03
--- /dev/null
+++ b/src/v3/example.ps1
@@ -0,0 +1,7 @@
+New-UDDashboard -Title "Hello, World!" -Content {
+    New-UDTypography -Text "Hello, World!"
+
+    New-UDButton -Text "Learn more about Universal Dashboard" -OnClick {
+        Invoke-UDRedirect https://docs.ironmansoftware.com
+    }
+}
\ No newline at end of file
diff --git a/src/v3/example/dashboard.ps1 b/src/v3/example/dashboard.ps1
index ba352e9a..c1006c4a 100644
--- a/src/v3/example/dashboard.ps1
+++ b/src/v3/example/dashboard.ps1
@@ -1,10 +1,11 @@
-$DebugPreference = 'Continue'
+$Cache:Help = @{}
+
 function New-ComponentPage {
     param(
-        [Parameter(Mandatory)]
-        [string]$Description, 
         [Parameter(Mandatory)]
         [string]$Title, 
+        [Parameter(Mandatory)]
+        [string]$Description, 
         [Parameter()]
         [string]$SecondDescription, 
         [Parameter(Mandatory)]
@@ -13,7 +14,9 @@ function New-ComponentPage {
         [string[]]$Cmdlet
         ) 
 
-    New-UDPage -Name $Title -Content {
+    $AdditionalParameters = @{}
+
+    New-UDPage @AdditionalParameters -Name $Title -Content {
         New-UDContainer {
             New-AppBar -Title $title
             
@@ -42,28 +45,36 @@ function New-ComponentPage {
                 New-UDTypography -Text 'Parameters' -Variant h4
             }
     
-            foreach($item in $Cmdlet)
-            {
-                $Parameters = (Get-Command $item).Parameters.GetEnumerator() | ForEach-Object {
-                    
-                    $Parameter = $_.Key
-
-                    $Help = Get-Help -Name $item -Parameter $Parameter -ErrorAction SilentlyContinue
-                    
-                    if ($null -ne $Help)
+            New-UDDynamic -Content {
+                foreach($item in $Cmdlet)
+                {
+                    if ($Cache:Help.ContainsKey($item)) {
+                        $Parameters = $Cache:Help[$item]
+                    }
+                    else 
                     {
-                        @{
-                            name = $Help.name 
-                            type = $Help.type.name
-                            description = $Help.description.text
-                            required = $Help.required
+                        $Parameters = (Get-Command $item).Parameters.GetEnumerator() | ForEach-Object {
+                            $Parameter = $_.Key
+        
+                            $Help = Get-Help -Name $item -Parameter $Parameter -ErrorAction SilentlyContinue
+                            
+                            if ($null -ne $Help)
+                            {
+                                @{
+                                    name = $Help.name 
+                                    type = $Help.type.name
+                                    description = $Help.description.text
+                                    required = $Help.required
+                                }
+                            }
                         }
+                        $Cache:Help[$item] = $Parameters
+                    }
+                    
+                    if ($Parameters)
+                    {
+                        New-UDTable -Title $item -Data $Parameters -Columns $Columns
                     }
-                }
-                 
-                if ($Parameters)
-                {
-                    New-UDTable -Title $item -Data $Parameters -Columns $Columns
                 }
             }
         }
@@ -87,13 +98,13 @@ function New-Example {
         } -Content $Example
     }
 
-    New-UDCard -Content {
+    New-UDCard -Children {
         New-UDElement -Tag 'pre' -Content { $Example.ToString().Trim() }
     }
 }
 
 function New-AppBar {
-    param($title, [Switch]$NoPadding)
+    param($title)
 
     $Drawer = New-UDDrawer -Children {
         New-UDList -Children {
@@ -144,7 +155,6 @@ function New-AppBar {
                 New-UDListItem -Label "Typography" -OnClick { Invoke-UDRedirect -Url '/typography' }
             }
             New-UDListItem -Label "Data Visualization" -Children {
-                New-UDListItem -Label "Maps" -OnClick { Invoke-UDRedirect -Url '/maps' }
                 New-UDListItem -Label 'Nivo' -Children {
                     New-UDListItem -Label "Overview" -OnClick { Invoke-UDRedirect -Url '/nivo' }
                     New-UDListItem -Label "Bar" -OnClick { Invoke-UDRedirect -Url '/nivo-bar' }
@@ -163,88 +173,39 @@ function New-AppBar {
         New-UDElement -Tag 'div' -Content {$title}
     } -Drawer $Drawer
 
-    if (-not $NoPadding) {
-        New-UDElement -Tag 'div' -Attributes @{ style = @{ paddingTop = '20px'}} -Content {}
-    }   
+    New-UDElement -Tag 'div' -Attributes @{ style = @{ paddingTop = '20px'}} -Content {}
 }
 
 $Pages = @()
 $Pages += New-UDPage @AdditionalParameters -Name "PowerShell Universal Dashboard" -Content {
     
-    New-AppBar -Title "PowerShell Universal Dashboard" -NoPadding
-
-    New-UDElement -Tag 'div' -Content {
-        New-UDContainer {
-            New-UDGrid -Container -Content {
-                New-UDGrid -Item -SmallSize 3 -Content {
-                    New-UDImage -Url 'https://github.com/ironmansoftware/universal-dashboard/raw/master/images/logo.png' -Height 128
-                }
-                New-UDGrid -Item -SmallSize 9 -Content { 
-                    New-UDTypography -Text 'PowerShell Universal Dashboard' -Variant h2 
-                    New-UDTypography -Text "The most popular web framework for PowerShell" -Variant h4
-                }
-            }
-        }
-    } -Attributes @{
-        style = @{
-            width = '100%'
-            backgroundColor = 'white'
-            paddingBottom = '20px'
-            paddingTop = '20px'
-        }
-    }
+    New-AppBar -Title "PowerShell Universal Dashboard"
 
     New-UDContainer {
-        New-UDElement -Tag 'div' -Content {
-        
-        } -Attributes @{
-            style = @{
-                height = '25px'
+        New-UDGrid -Container -Content {
+            New-UDGrid -Item -SmallSize 3 -Content {
+                New-UDImage -Url 'https://github.com/ironmansoftware/universal-dashboard/raw/master/images/logo.png'
+            }
+            New-UDGrid -Item -SmallSize 9 -Content { 
+                New-UDTypography -Text 'PowerShell Universal Dashboard' -Variant h2 
+                New-UDTypography -Text "The most popular web framework for PowerShell" -Variant h4
+                New-UDTypography -Text "Part of PowerShell Universal" -Variant h4
+                New-UDButton -Variant outlined -Text "Get Started" -OnClick { Invoke-UDRedirect -Url "https://www.ironmansoftware.com/downloads" }
             }
         }
 
-        New-UDTypography -Text "Get Started" -Variant h2 
-
         New-UDGrid -Container -Content {
             New-UDGrid -Item -SmallSize 6 -Content {
                 New-UDCard -Title "Installation" -Content {
-                    New-UDElement -Tag p -Content {
-                        New-UDTypography -Text "Universal Dashboard is included with the PowerShell Universal installer" -Paragraph
-                    }
-                    New-UDElement -Tag p -Content {
-                        New-UDButton -Variant outlined -Text "Download" -OnClick { Invoke-UDRedirect -Url "https://www.ironmansoftware.com/downloads" }
-                    }
+                    New-UDTypography -Text "Universal Dashboard is included with the PowerShell Universal installer" -Paragraph
+                    New-UDButton -Variant outlined -Text "Download" -OnClick { Invoke-UDRedirect -Url "https://www.ironmansoftware.com/downloads" }
                 }
             }
 
             New-UDGrid -Item -SmallSize 6 -Content {
-                New-UDCard -Title "Documentation" -Content {
-                    New-UDElement -Tag p -Content {
-                        New-UDTypography -Text "Learn how to get up and running witrh PowerShell Universal" -Paragraph
-                        New-UDButton -Variant outlined -Text "Learn More" -OnClick { Invoke-UDRedirect -Url "https://docs.ironmansoftware.com/getting-started" }
-                    }
-                }
-            }
-
-            New-UDGrid -Item -SmallSize 6 -Content {
-                New-UDCard -Title "Marketplace" -Content {
-                    New-UDElement -Tag p -Content {
-                        New-UDTypography -Text "Access a huge collection of community contributed controls and dashboards." -Paragraph
-                    }
-                    New-UDElement -Tag p -Content {
-                        New-UDButton -Variant outlined -Text "Learn More" -OnClick { Invoke-UDRedirect -Url "https://marketplace.universaldashboard.io" }
-                    }
-                }
-            }
-
-            New-UDGrid -Item -SmallSize 6 -Content {
-                New-UDCard -Title "PowerShell Universal" -Content {
-                    New-UDElement -Tag p -Content {
-                        New-UDTypography -Text "PowerShell Universal Dashboard is now part of the PowerShell Universal platform. " -Paragraph
-                    }
-                    New-UDElement -Tag p -Content {
-                        New-UDButton -Variant outlined -Text "Learn More" -OnClick { Invoke-UDRedirect -Url "https://ironmansoftware.com/ud-ua-powershell-universal/" }
-                    }
+                New-UDCard -Title "Get Started" -Content {
+                    New-UDTypography -Text "Learn more on our docs" -Paragraph
+                    New-UDButton -Variant outlined -Text "Learn More" -OnClick { Invoke-UDRedirect -Url "https://docs.ironmansoftware.com/getting-started" }
                 }
             }
         }
diff --git a/src/v3/example/start.ps1 b/src/v3/example/start.ps1
index 655242b2..1202d3a3 100644
--- a/src/v3/example/start.ps1
+++ b/src/v3/example/start.ps1
@@ -25,8 +25,8 @@ try
     $AppToken = (Invoke-WebRequest "$Address/api/v1/apptoken/grant" -WebSession $PUWS).Content | ConvertFrom-Json
 
     Connect-UAServer -ComputerName $Address -AppToken $AppToken.Token
-    $Framework = Add-UDDashboardFramework -Name 'Test' -Version 'Test' -Path "$PSScriptRoot\..\output"
-    Add-UDDashboard -Name 'Test' -FilePath "$PSScriptRoot\dashboard.ps1" -Framework $Framework -BaseUrl '/' 
+    $Framework = Get-UDDashboardFramework | Where-Object { $_.Version.StartsWith("3")} 
+    Add-UDDashboard -Name 'Test' -FilePath "$PSScriptRoot\dashboard.ps1" -Framework $Framework -BaseUrl '/test' 
 }
 catch 
 {
diff --git a/src/v3/package-lock.json b/src/v3/package-lock.json
index 985a4c62..f10cbe29 100644
--- a/src/v3/package-lock.json
+++ b/src/v3/package-lock.json
@@ -10756,6 +10756,15 @@
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
       "dev": true
     },
+    "use-error-boundary": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/use-error-boundary/-/use-error-boundary-1.2.3.tgz",
+      "integrity": "sha512-RRgZmkY2rySvxP7R6wrPCjq5YjKJnfyhu5chzQUGsTmEddIq3RJdYfmsEq79QoDOQEAF+YWkf7PwqBcAFGFKAw==",
+      "requires": {
+        "prop-types": "^15.7.2",
+        "react": "^16.8.6"
+      }
+    },
     "use-memo-one": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.1.tgz",
diff --git a/src/v3/package.json b/src/v3/package.json
index 3ed42d1a..64e63286 100644
--- a/src/v3/package.json
+++ b/src/v3/package.json
@@ -11,26 +11,39 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@microsoft/signalr": "3.1.3",
+    "@date-io/date-fns": "^1.3.13",
     "@fortawesome/fontawesome-svg-core": "^1.2.17",
     "@fortawesome/free-brands-svg-icons": "5.8.1",
     "@fortawesome/free-regular-svg-icons": "^5.8.1",
     "@fortawesome/free-solid-svg-icons": "5.8.1",
     "@fortawesome/react-fontawesome": "^0.1.4",
+    "@material-ui/core": "^4.9.3",
+    "@material-ui/icons": "^4.5.1",
+    "@material-ui/lab": "^4.0.0-alpha.43",
+    "@material-ui/pickers": "^3.2.10",
+    "@material-ui/system": "^4.7.1",
+    "@microsoft/signalr": "3.1.3",
     "@theme-ui/color-modes": "^0.3.1",
     "@theme-ui/presets": "0.3.0",
+    "classnames": "^2.2.6",
     "copy-to-clipboard": "^3.2.0",
     "core-js": "^3.6.1",
     "create-react-class": "15.6.3",
+    "date-fns": "^2.9.0",
+    "eslint-loader": "^3.0.3",
     "izitoast": "1.3.0",
     "jquery": "3.5.0",
     "js-cookie": "2.2.1",
+    "lodash": "^4.17.15",
+    "material-table": "^1.57.2",
     "moment": "2.24.0",
     "node-sass": "4.13.0",
     "promise-polyfill": "8.1.3",
     "pubsub-js": "1.8.0",
     "react": "16.12.0",
     "react-dom": "^16.12.0",
+    "react-hot-loader": "^4.12.19",
+    "react-interval": "^2.1.1",
     "react-redux": "7.1.3",
     "react-router-dom": "5.1.2",
     "react-spinkit": "^3.0.0",
@@ -39,22 +52,10 @@
     "redux-thunk": "2.3.0",
     "theme-ui": "0.3.1",
     "tslib": "^1.9.3",
-    "whatwg-fetch": "^2.0.3",
-    "@date-io/date-fns": "^1.3.13",
-    "@material-ui/core": "^4.9.3",
-    "@material-ui/icons": "^4.5.1",
-    "@material-ui/lab": "^4.0.0-alpha.43",
-    "@material-ui/pickers": "^3.2.10",
-    "@material-ui/system": "^4.7.1",
-    "classnames": "^2.2.6",
-    "date-fns": "^2.9.0",
-    "eslint-loader": "^3.0.3",
-    "lodash": "^4.17.15",
-    "material-table": "^1.57.2",
-    "react-hot-loader": "^4.12.19",
-    "react-interval": "^2.1.1",
     "typeface-roboto": "0.0.75",
-    "typeface-roboto-condensed": "0.0.75"
+    "typeface-roboto-condensed": "0.0.75",
+    "use-error-boundary": "^1.2.3",
+    "whatwg-fetch": "^2.0.3"
   },
   "devDependencies": {
     "@babel/core": "7.7.7",
diff --git a/src/v3/tests.build.ps1 b/src/v3/tests.build.ps1
index a3babb48..0ab5b2b1 100644
--- a/src/v3/tests.build.ps1
+++ b/src/v3/tests.build.ps1
@@ -1,3 +1,5 @@
+param($Script)
+
 Import-Module Selenium
 
 $OutputPath = "$PSScriptRoot\..\..\output"
@@ -26,13 +28,12 @@ task InitTests {
 
     try 
     {
-
         Invoke-WebRequest "$Address/api/v1/signin" -Method Post -Body (@{ username = 'admin'; password = '1234' } | ConvertTo-Json) -SessionVariable 'PUWS' -ContentType 'application/json' | out-null
         $AppToken = (Invoke-WebRequest "$Address/api/v1/apptoken/grant" -WebSession $PUWS).Content | ConvertFrom-Json
     
         Connect-UAServer -ComputerName $Address -AppToken $AppToken.Token
         $Framework = Add-UDDashboardFramework -Name 'Test' -Version 'Test' -Path "$PSScriptRoot\output"
-        Add-UDDashboard -Name 'Test' -FilePath "$PSScriptRoot\dashboard.ps1" -Framework $Framework -BaseUrl '/test' 
+        Add-UDDashboard -Name 'Test' -FilePath "$PSScriptRoot\dashboard.ps1" -Framework $Framework -BaseUrl '/test' | Out-Null
     }
     catch 
     {
@@ -51,12 +52,21 @@ task Run {
 
     $OutputPath = "$PSScriptRoot\test-results" 
     Remove-Item $OutputPath -Recurse -ErrorAction SilentlyContinue -Force
-    New-Item -Path $OutputPath -ItemType Directory
+    New-Item -Path $OutputPath -ItemType Directory | Out-Null
 
     Push-Location $PSScriptRoot
 
-    Get-ChildItem "$PSScriptRoot\Tests" -Filter "*.tests.ps1" | ForEach-Object {
-        . $_.FullName
+    
+    if ($Script)
+    {
+        . (Join-Path "$PSScriptRoot\Tests" $Script)
+    }
+    else 
+    {
+        Get-ChildItem "$PSScriptRoot\Tests" -Filter "*.tests.ps1" | ForEach-Object {
+            . $_.FullName
+        }
+    
     }
 
     Pop-Location