diff --git a/app/views/admin_panel/index.rhtml b/app/views/admin_panel/index.rhtml
index b9a0d75..b07afe4 100644
--- a/app/views/admin_panel/index.rhtml
+++ b/app/views/admin_panel/index.rhtml
@@ -1,11 +1,11 @@
-<h1><%= _('Administrator Panel') %></h1>
+/<h1><%= _('Administrator Panel') %></h1>
 
 <p><%= _('You, as an environment administrator, has the following options:')%></p>
 
 <ul>
   <li><%= link_to _('Edit site info'), :action => 'site_info' %></li>
   <li><%= link_to _('Enable/disable features'), :controller => 'features' %></li>
-  <li><%= link_to _('Edit the Visual Design'), :controller => 'edit_template'%></li>
+  <li><%= link_to _('Edit the Visual Design'), :controller => 'environment_design'%></li>
   <li><%= link_to _('Manage Categories'), :controller => 'categories'%></li>
   <li><%= link_to _('Manage User roles'), :controller => 'role' %></li>
   <li><%= link_to _('Manage Validators by region'), :controller => 'region_validators' %></li>
diff --git a/test/functional/admin_panel_controller_test.rb b/test/functional/admin_panel_controller_test.rb
index 31aaf04..aab3146 100644
--- a/test/functional/admin_panel_controller_test.rb
+++ b/test/functional/admin_panel_controller_test.rb
@@ -22,15 +22,34 @@ class AdminPanelControllerTest < Test::Unit::TestCase
     assert_valid_xhtml
   end
   
-  def test_index
+  should 'link to site_info editing page' do
     get :index
-    assert_template 'index'
-    assert_tag :tag => 'a', :attributes => { :href => /site_info/ }
-    assert_tag :tag => 'a', :attributes => { :href => /categories/ }
-    assert_tag :tag => 'a', :attributes => { :href => /edit_template/ }
-    assert_tag :tag => 'a', :attributes => { :href => /features/ }
-    assert_tag :tag => 'a', :attributes => { :href => /role/ }
-    assert_tag :tag => 'a', :attributes => { :href => /region_validators/ }
+    assert_tag :tag => 'a', :attributes => { :href => '/admin/admin_panel/site_info' }
+  end
+
+  should 'link to cateogries editing' do
+    get :index
+    assert_tag :tag => 'a', :attributes => { :href => '/admin/categories' }
+  end
+
+  should 'link to design editor' do
+    get :index
+    assert_tag :tag => 'a', :attributes => { :href => '/admin/environment_design' }
+  end
+
+  should 'link to features editing screen' do
+    get :index
+    assert_tag :tag => 'a', :attributes => { :href => '/admin/features' }
+  end
+
+  should 'link to role editing screen' do
+    get :index
+    assert_tag :tag => 'a', :attributes => { :href => '/admin/role' }
+  end
+
+  should 'link to region validator screen' do
+    get :index
+    assert_tag :tag => 'a', :attributes => { :href => '/admin/region_validators' }
   end
   
   should 'display form for editing site info' do
--
libgit2 0.21.2