diff --git a/source/components/QuickLinks.js b/source/components/QuickLinks.js
index f8a157a95..7c1315a40 100644
--- a/source/components/QuickLinks.js
+++ b/source/components/QuickLinks.js
@@ -18,7 +18,6 @@ type Props = {
 
 const QuickLinks = ({
 	startConversation,
-	location,
 	validInputEntered,
 	quickLinks,
 	conversationStarted
@@ -34,7 +33,7 @@ const QuickLinks = ({
 			native>
 			{styles => (
 				<animated.div
-					className="ui__ button-container"
+					className="ui__ answer-group"
 					style={{
 						...styles,
 						display: 'flex',
diff --git a/source/components/ui/Button/button.css b/source/components/ui/Button/button.css
index 606a833c6..fabf4dc81 100644
--- a/source/components/ui/Button/button.css
+++ b/source/components/ui/Button/button.css
@@ -191,17 +191,7 @@
 	padding: 0.4rem 0.8rem;
 	border-radius: 0.3rem;
 }
-.ui__.button-container {
-	display: flex;
-	flex-wrap: wrap;
-	justify-content: flex-end;
-}
-.ui__.button-container > * {
-	margin: 0;
-}
-.ui__.button-container > :not(:last-child) {
-	margin-right: 1rem;
-}
+
 
 @keyframes push-button-down {
 	from {
diff --git a/source/components/ui/index.css b/source/components/ui/index.css
index 17ce7adbe..a41ab6659 100644
--- a/source/components/ui/index.css
+++ b/source/components/ui/index.css
@@ -25,6 +25,13 @@ button {
 	display: flex;
 	align-items: center;
 	justify-content: flex-end;
+	flex-wrap: wrap;
+	margin-bottom: 1rem;
+}
+@media (min-width: 500px) {
+	.ui__.answer-group > :not(:last-child) {
+		margin-right: 1rem;
+	}
 }
 @media (max-width: 500px) {
 	.ui__.answer-group {
diff --git a/source/sites/mycompanyinfrance.fr/pages/SocialSecurity/Home.js b/source/sites/mycompanyinfrance.fr/pages/SocialSecurity/Home.js
index ff97fffd4..51201dc7a 100644
--- a/source/sites/mycompanyinfrance.fr/pages/SocialSecurity/Home.js
+++ b/source/sites/mycompanyinfrance.fr/pages/SocialSecurity/Home.js
@@ -57,7 +57,7 @@ class SocialSecurity extends Component<Props, {}> {
 								</T>
 							</p>
 							<h2>Que souhaitez-vous estimer ?</h2>
-							<div className="ui__ button-container">
+							<div className="ui__ answer-group">
 								<Link
 									className="ui__ button"
 									to={