diff --git a/src/ContactBook/WAContact.class.st b/src/ContactBook/WAContact.class.st
index d9663ce..21eb575 100644
--- a/src/ContactBook/WAContact.class.st
+++ b/src/ContactBook/WAContact.class.st
@@ -1,6 +1,6 @@
 Class {
 	#name : 'WAContact',
-	#superclass : 'WAComponent',
+	#superclass : 'SBSRootComponent',
 	#instVars : [
 		'contact'
 	],
@@ -59,7 +59,7 @@ WAContact >> renderEmailFieldOn: html [
 		html emailInput
 			formControl;
 			placeholder: 'your@email.eu';
-			callback: [ :value | self contact email: value ];
+			callback: [ :value | self contact email: value address ];
 			value: (self contact email ifNil: '') ]
 ]
 
@@ -82,7 +82,8 @@ WAContact >> renderFullnameFieldOn: html [
 
 { #category : 'as yet unclassified' }
 WAContact >> renderSubmitButtonOn: html [
-	html submitButton
+	html formButton
+		beSubmit;
 		beSuccess;
 		bePrimary;
 		callback: [ self answer: self contact ];
diff --git a/src/ContactBook/WAContactBook.class.st b/src/ContactBook/WAContactBook.class.st
index 1e0d7fb..209cbe0 100644
--- a/src/ContactBook/WAContactBook.class.st
+++ b/src/ContactBook/WAContactBook.class.st
@@ -1,6 +1,6 @@
 Class {
 	#name : 'WAContactBook',
-	#superclass : 'WAComponent',
+	#superclass : 'SBSRootComponent',
 	#instVars : [
 		'contactBook'
 	],
@@ -12,7 +12,7 @@ Class {
 WAContactBook class >> initialize [
 	(WAAdmin register: self asApplicationAt: 'contacts')
 		addLibrary: JQDeploymentLibrary;
-		addLibrary: SBSDevelopmentLibrary
+		addLibrary: SBSDeploymentLibrary 
 ]
 
 { #category : 'rendering' }
@@ -98,7 +98,7 @@ WAContactBook >> renderGlobalButtonsOn: html [
 
 { #category : 'rendering' }
 WAContactBook >> renderPhotoOf: aContact on: html [
-	html image url: aContact gravatarUrl 
+	html image url: aContact gravatarUrl
 ]
 
 { #category : 'rendering' }