diff --git a/media/less/common.less b/media/less/common.less
index f7c7d55902947f937d3aa916f0be291a19fab322..903f2fa7ce217670afdfd253fff13f25bda94e02 100644
--- a/media/less/common.less
+++ b/media/less/common.less
@@ -305,12 +305,10 @@ input[type="checkbox"] {
 .semesterLayer {
     display: inline-block;
     width: auto;
-    position: absolute;
-    left: 45%;
     .semesterChanger, .semesterSwitcherBtn {
+        //margin-left: 0px;
         font-family: @FontFamily;
         font-size: 1em;
-        color: @ColorText;
     }
     .semesterSwitcher {
         display: block;
@@ -323,6 +321,8 @@ input[type="checkbox"] {
         .box-shadow(0 0 5px, @ColorGrey);
         .radius(5px);
         li {
+            margin-bottom: 5px;
+            &:last-child { margin-bottom: 0; }
         }
     }
 }
diff --git a/~dev_rating/application/classes/Controller/Teacher/Index.php b/~dev_rating/application/classes/Controller/Teacher/Index.php
index d6e7c9d7a725789057c50b986dee3762f31734ea..b76c8e1e0e52f5c9ba4e41f6d70af31b3e735cdb 100644
--- a/~dev_rating/application/classes/Controller/Teacher/Index.php
+++ b/~dev_rating/application/classes/Controller/Teacher/Index.php
@@ -41,7 +41,6 @@ class Controller_Teacher_Index extends Controller_Environment_Teacher
             'Subjects'     => $subjects,
             'Teachers'     => $teachers,
             'Groups'       => $groups,
-            'SemesterList' => Model_Semesters::loadAll(),
         ])->set_filename('teacher/index');
     }
 
diff --git a/~dev_rating/application/classes/Twig.php b/~dev_rating/application/classes/Twig.php
index d153150097250d95a95610324a52e55a1b795610..cd455668e8aa667a8e19140bb4756ee9cc279d3c 100644
--- a/~dev_rating/application/classes/Twig.php
+++ b/~dev_rating/application/classes/Twig.php
@@ -27,6 +27,7 @@ class Twig extends Kohana_Twig
             'Arr' => new Arr,
             'Inflector' => new Inflector,
             'System' => array('Title' => ASSEMBLY_SYSTEM_NAME, 'Version' => ASSEMBLY_VERSION),
+            'SemesterList' => Model_Semesters::loadAll()
         ]);
         return $twig;
     }