diff --git a/Resources/Private/TypoScript/Neos/Page.ts2 b/Resources/Private/TypoScript/Neos/Page.ts2
index 70b6ac4..2a36e5b 100644
--- a/Resources/Private/TypoScript/Neos/Page.ts2
+++ b/Resources/Private/TypoScript/Neos/Page.ts2
@@ -2,15 +2,11 @@ prototype(TYPO3.Neos:Page) {
 	# Define short nodeType name (without package prefix)
 	@override.nodeTypeShort = ${String.toLowerCase(String.substr(q(node).property('_nodeType.name'), 1+String.lastIndexOf(q(node).property('_nodeType.name'), ':')))}
 
-	head {
-		stylesheets.@process.fontAwesome = ${value + '<link href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">'}
-	}
-
 	bodyTag {
 		# Add custom properties/attributes from M12.Foundation:AbstractDevBase
-		attributes {
+		attributes = TYPO3.TypoScript:Attributes {
 			class = TYPO3.TypoScript:RawArray {
-				layout = ${q(node).property('layout')}
+				layout = ${q(node).property('layout') ? 'layout-'+q(node).property('layout') : 'layout-default'}
 				customLook = ${q(node).property('customLook') ? q(node).property('customLook')+' '+nodeTypeShort+'-'+q(node).property('customLook') : null}
 				customClass = ${q(node).property('customCssClass') ? q(node).property('customCssClass') : null}