diff --git a/assets/js/app.js b/assets/js/app.js
index 0dae3774cafbe646d07727a9783302f473b51745..d979132f4908b71d6dbfac3f0512ae4f3bd46f5d 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -158,15 +158,19 @@ function constructQuestion(data) {
 
     dataset.ids.push(data['id']);
 
-    label.innerText = data['label'];
+    label.innerText = data['label'] + ' (' + (isScq ? 'Single choice' : 'Multiple choice') + ')';
 
     answersContainer.setAttribute('id', 'answers_container');
 
     questionBlock.append(label);
 
     for (let i = 0; i < data['answers'].length; i += 1) {
-        let input = document.createElement('input'),
-            label = document.createElement('label');
+        let container = document.createElement('div'),
+            input = document.createElement('input'),
+            label = document.createElement('label')
+        ;
+
+        container.setAttribute('class', 'input-container');
 
         input.setAttribute('type', isScq ? 'radio' : 'checkbox');
         input.setAttribute('id', `answer_${i}`);
@@ -178,8 +182,9 @@ function constructQuestion(data) {
         label.setAttribute('for', `answer_${i}`);
         label.innerText = data['answers'][i]['label'];
 
-        answersContainer.append(input);
-        answersContainer.append(label);
+        container.append(input);
+        container.append(label);
+        answersContainer.append(container);
     }
 
     questionBlock.append(answersContainer);
diff --git a/assets/scss/app.scss b/assets/scss/app.scss
index 0c351ff5a6287d16edd495df935ccd8cdc0112d5..03d961df06974d3d4efd383e5c4027bc5326f648 100644
--- a/assets/scss/app.scss
+++ b/assets/scss/app.scss
@@ -6,6 +6,7 @@ header nav a,
 .admin > a[data-target="close"] {
   color: black;
   text-decoration: none;
+  cursor: pointer;
   &:active,
   &:visited {
     color: black;
@@ -26,6 +27,10 @@ header {
   }
 }
 
+button {
+  cursor: pointer;
+}
+
 p {
   &.correct,
   &.wrong {