diff --git a/static/js/topic.js b/static/js/topic.js
index 6a97ba8..fd4e280 100644
--- a/static/js/topic.js
+++ b/static/js/topic.js
@@ -32,7 +32,7 @@ function updateQuestion(response) {
         new_question(params["type"], params["question"], params["tries"], params["progress"]);
         break;
     case "finished_topic":
-        $('#submit').hide();
+        $('#submit, #comments, #solution').remove();
         $("#content").html(response["params"]["question"]);
         $('#topic_progress').css('width', '100%').attr('aria-valuenow', 100);
         $("#content").animateCSS('tada');
diff --git a/templates/topic.html b/templates/topic.html
index 99e884c..a1aa357 100644
--- a/templates/topic.html
+++ b/templates/topic.html
@@ -77,22 +77,30 @@
 	<div id="notifications"></div>
 
 	<!-- <div class="container"> -->
-	<div class="row">
-	<div class="col col-lg-9">
-			<div class="my-5" id="content">
-				<form action="/question" method="post" id="question_form" autocomplete="off">
-					{% module xsrf_form_html() %}
-					<div id="question_div"></div>
-				</form>
+	<!-- <div class="row"> -->
+	<!-- <div class="col col-lg-9"> -->
+		<div class="my-5" id="content">
+			<form action="/question" method="post" id="question_form" autocomplete="off">
+				{% module xsrf_form_html() %}
+				<div id="question_div"></div>
+			</form>
+
+			<div id="comments"></div>
+		</div>
 
-				<div id="comments"></div>
-				<div id="solution"></div>
+	<!-- </div> col -->
+	<!-- <div class="col col-lg-3"> -->
+		<button class="btn btn-primary btn-lg btn-block my-5" id="submit" data-toggle="tooltip" data-placement="right" title="Shift-Enter">Responder</button>
 
+		<div id="wrong" style="display: none">
+			<div class="alert alert-danger">
+				<i class="fas fa-thumbs-down fa-3x"></i>
+				<br><br>
+				Desta vez não acertou,
+				<br>
+				mas também se aprende com os erros...
 			</div>
-
-	</div> <!-- col -->
-	<div class="col col-lg-3">
-		<button class="btn btn-primary btn-lg btn-block my-5" id="submit" data-toggle="tooltip" data-placement="right" title="Shift-Enter">Responder</button>
+		</div>
 
 		<div id="right" style="display: none">
 			<div class="alert alert-success">
@@ -101,17 +109,12 @@
 				Excelente resposta!
 			</div>
 		</div>
-		<div id="wrong" style="display: none">
-			<div class="alert alert-danger">
-				<i class="fas fa-thumbs-down fa-3x"></i>
-				<br><br>
-				Desta vez não acertou,
-        <br>
-        mas também se aprende com os erros...
-			</div>
-		</div>
-	</div> <!-- col -->
-	</div> <!-- row -->
+
+		<div id="solution"></div>
+
+
+		<!-- </div> col -->
+	<!-- </div> row -->
 	<!-- </div> --> <!-- container -->
 </div>
 
--
libgit2 0.21.2