diff --git a/enact-all-samples/src/components/ButtonToSamples/ButtonToSamples.js b/enact-all-samples/src/components/ButtonToSamples/ButtonToSamples.js
index 4632b940..dfd54cc0 100644
--- a/enact-all-samples/src/components/ButtonToSamples/ButtonToSamples.js
+++ b/enact-all-samples/src/components/ButtonToSamples/ButtonToSamples.js
@@ -1,4 +1,4 @@
-import Button from '@enact/moonstone/Button';
+import IconButton from '@enact/moonstone/IconButton';
 import {Link} from 'react-router-dom';
 import React from 'react';
 
@@ -7,12 +7,11 @@ import css from './ButtonToSamples.module.less';
 const ButtonToSamples = () => (
 	<div className={css.buttonContainer}>
 		<Link to="/" className={css.backLink}>
-			<Button
-				className={css.backButton}
-				style={{zIndex: 1}}
+			<IconButton
+				aria-label="Back To Samples"
 			>
-				Back To Samples
-			</Button>
+				arrowhookleft
+			</IconButton>
 		</Link>
 	</div>
 );
diff --git a/enact-all-samples/src/components/ButtonToSamples/ButtonToSamples.module.less b/enact-all-samples/src/components/ButtonToSamples/ButtonToSamples.module.less
index 8d28e37f..6de66cff 100644
--- a/enact-all-samples/src/components/ButtonToSamples/ButtonToSamples.module.less
+++ b/enact-all-samples/src/components/ButtonToSamples/ButtonToSamples.module.less
@@ -1,22 +1,10 @@
 .backLink {
-	z-index: 1;
-	margin-right: 5%;
-
-	.backButton {
-		z-index: 2;
-		transform: translate(0px, -100px);
-		transition: all .5s ease-in-out;
-	}
-
-	&:hover {
-		.backButton {
-			transform: translate(0px, 0px);
-		}
-	}
+	z-index: 2;
 }
 
 .buttonContainer {
 	display: flex;
 	flex-direction: row;
 	justify-content: flex-end;
-}
\ No newline at end of file
+	padding: 33px 6px;
+}
diff --git a/enact-all-samples/src/index.js b/enact-all-samples/src/index.js
index 0ef65573..3cbddf31 100644
--- a/enact-all-samples/src/index.js
+++ b/enact-all-samples/src/index.js
@@ -1,3 +1,5 @@
+import kind from '@enact/core/kind';
+import MoonstoneDecorator from '@enact/moonstone/MoonstoneDecorator';
 import {HashRouter as Router, Route} from 'react-router-dom';
 import React from 'react';
 import {render} from 'react-dom';
@@ -52,14 +54,22 @@ console.error = (...args) => {
 };
 /* eslint-enable no-console */
 
-const appElement = (
-	<Router>
-		<div>
-			<ButtonToSamples />
-			{routes.map((route, index) => <Route key={index} {...route} />)}
-		</div>
-	</Router>
-);
+const SampleRoutes = MoonstoneDecorator(kind({
+	name:  'SampleRoutes',
+
+	render: () => {
+		return (
+			<Router>
+				<div>
+					<ButtonToSamples />
+					{routes.map((route, index) => <Route key={index} {...route} />)}
+				</div>
+			</Router>
+		);
+	}
+}));
+
+const appElement =  <SampleRoutes />;
 
 // In a browser environment, render the app to the document.
 if (typeof window !== 'undefined') {
diff --git a/pattern-expandablelist-object/src/views/MainPanel.js b/pattern-expandablelist-object/src/views/MainPanel.js
index cab654a4..073f39a8 100644
--- a/pattern-expandablelist-object/src/views/MainPanel.js
+++ b/pattern-expandablelist-object/src/views/MainPanel.js
@@ -1,11 +1,16 @@
 import ExpandableList from '@enact/moonstone/ExpandableList';
 import {Header, Panel} from '@enact/moonstone/Panels';
 import kind from '@enact/core/kind';
+import PropTypes from 'prop-types';
 import React from 'react';
 
 const MainPanel = kind({
 	name: 'MainPanel',
 
+	propTypes: {
+		title: PropTypes.string
+	},
+
 	render: (props) => (
 		<Panel {...props}>
 			<Header title={props.title} />
diff --git a/pattern-layout/src/views/MainPanel.js b/pattern-layout/src/views/MainPanel.js
index 70fd1907..04016aad 100644
--- a/pattern-layout/src/views/MainPanel.js
+++ b/pattern-layout/src/views/MainPanel.js
@@ -10,7 +10,8 @@ const GridItem = kind({
 	name: 'GridItem',
 	propTypes: {
 		index: PropTypes.number,
-		items: PropTypes.array
+		items: PropTypes.array,
+		onSelect: PropTypes.func
 	},
 	handlers: {
 		onSelect: (ev, {index, onSelect}) => onSelect({index})