diff --git a/app/Http/Controllers/ExercicioController.php b/app/Http/Controllers/ExercicioController.php
index 4a06445..57977c7 100644
--- a/app/Http/Controllers/ExercicioController.php
+++ b/app/Http/Controllers/ExercicioController.php
@@ -27,11 +27,22 @@ class ExercicioController extends Controller
 	/**
 	 * Display a listing of the resource.
 	 *
-	 * @return \Illuminate\Http\Response
 	 */
 	public function index()
 	{
-    return redirect()->action([TopicoController::class, 'index']);
+    $topicos = Topico::orderBy('order');
+    $semTopico = Exercicio::whereDoesntHave('topico')->orderBy('name');
+    /** @var \App\Models\User */
+    $user = Auth::user();
+    if (optional($user)->isAdmin()) {
+      $topicos = $topicos->with('exercicios');
+    } else {
+      $topicos = $topicos->with('exerciciosPublished');
+      $semTopico = $semTopico->published();
+    }
+
+    return View('exercicio.index')->with('topicos', $topicos->get())
+      ->with('semTopico', $semTopico->get());
 	}
 
 	/**
diff --git a/app/Http/Controllers/TopicoController.php b/app/Http/Controllers/TopicoController.php
index 465fba6..929b415 100644
--- a/app/Http/Controllers/TopicoController.php
+++ b/app/Http/Controllers/TopicoController.php
@@ -15,19 +15,7 @@ class TopicoController extends Controller
    */
   public function index()
   {
-    $topicos = Topico::orderBy('order');
-    $semTopico = Exercicio::whereDoesntHave('topico')->orderBy('name');
-    /** @var \App\Models\User */
-    $user = Auth::user();
-    if (optional($user)->isAdmin()) {
-      $topicos = $topicos->with('exercicios');
-    } else {
-      $topicos = $topicos->with('exerciciosPublished');
-      $semTopico = $semTopico->published();
-    }
-
-    return View('topico.index')->with('topicos', $topicos->get())
-      ->with('semTopico', $semTopico->get());
+    return redirect()->action([ExercicioController::class, 'index']);
   }
 
   /**
diff --git a/resources/views/exercicio/index.blade.php b/resources/views/exercicio/index.blade.php
index 035d97f..b1f3323 100644
--- a/resources/views/exercicio/index.blade.php
+++ b/resources/views/exercicio/index.blade.php
@@ -1,6 +1,5 @@
 @extends('layouts.base')
 @section('content')
-<div class="container">
     <div class="row">
         <h1>Exercícios</h1>
     </div>
@@ -16,9 +15,9 @@
                 href="{{ URL::to('exercicio/create') }}">Cadastrar exercicio
             </a>
         @endcan
-        @can ('order', App\Models\Topico::class)
+        @can ('sort', App\Models\Topico::class)
             <a class="btn btn-small btn-edit inline"
-                href="{{ URL::to('topico/order') }}">Reordenar topicos
+                href="{{ URL::to('topico/sort') }}">Reordenar topicos
             </a>
         @endcan
         @can ('create', App\Models\Topico::class)
@@ -33,9 +32,8 @@
         @if (Session::has('message'))
             <div class="alert alert-info">{{ Session::get('message') }}</div>
         @endif
-        <!-- content -->
-        @include('exercicio.table', ['editButton' => true])
     </div>
+    <!-- content -->
+    @include('topico.table', ['editButton' => true])
 
-</div>
 @endsection
diff --git a/resources/views/topico/index.blade.php b/resources/views/topico/index.blade.php
deleted file mode 100644
index b1f3323..0000000
--- a/resources/views/topico/index.blade.php
+++ /dev/null
@@ -1,39 +0,0 @@
-@extends('layouts.base')
-@section('content')
-    <div class="row">
-        <h1>Exercícios</h1>
-    </div>
-
-    <div class="row gridline">
-        @can('bulk', App\Models\Exercicio::class)
-            <a class="btn btn-small btn-edit inline"
-                href="{{ URL::to('exercicio/exportall') }}">Exportar todos
-            </a>
-        @endcan
-        @can ('create', App\Models\Exercicio::class)
-            <a class="btn btn-small btn-edit inline"
-                href="{{ URL::to('exercicio/create') }}">Cadastrar exercicio
-            </a>
-        @endcan
-        @can ('sort', App\Models\Topico::class)
-            <a class="btn btn-small btn-edit inline"
-                href="{{ URL::to('topico/sort') }}">Reordenar topicos
-            </a>
-        @endcan
-        @can ('create', App\Models\Topico::class)
-            <a class="btn btn-small btn-edit inline"
-                href="{{ URL::to('topico/create') }}">Novo tópico
-            </a>
-        @endcan
-    </div>
-
-    <div class="row">
-        <!-- will be used to show any messages -->
-        @if (Session::has('message'))
-            <div class="alert alert-info">{{ Session::get('message') }}</div>
-        @endif
-    </div>
-    <!-- content -->
-    @include('topico.table', ['editButton' => true])
-
-@endsection