diff --git a/app/views/magic/_form.html.erb b/app/views/magic/_form.html.erb
index 96386371..fa4581f7 100644
--- a/app/views/magic/_form.html.erb
+++ b/app/views/magic/_form.html.erb
@@ -9,8 +9,7 @@
   <div class="control-group">
     <%= f.label :type_of_magic, :class => 'control-label' %>
     <div class="controls">
-      <%= f.text_field :type_of, :class => 'text_field' %>
-      <div class="help-inline">Spell, Ability, Enchantment, etc</div>
+      <%= f.text_field :type_of, :class => 'text_field', :value => (params[:type_of] || "").capitalize %>
     </div>
   </div>
 </div>
diff --git a/app/views/magic/index.html.erb b/app/views/magic/index.html.erb
index 241c2192..08dd723f 100644
--- a/app/views/magic/index.html.erb
+++ b/app/views/magic/index.html.erb
@@ -29,6 +29,17 @@
   </tbody>
 </table>
 
-<%= link_to t('.new', :default => t("helpers.links.new")),
-            magic_create_path,
-            :class => 'btn btn-primary' %>
+<div class="well" style="margin-top: 20px;">
+	<h4>Planning magic</h4>
+	<p>
+		Magic, the most wonderous thing! How does it work?
+	</p>
+	
+	<%= link_to 'New magic', magic_create_path, :class => 'btn btn-primary' %>
+
+	<%= link_to 'New spell', magic_create_type_path(:spell), :class => 'btn' %>
+	<%= link_to 'New enchantment', magic_create_type_path(:enchantment), :class => 'btn' %>
+	<%= link_to 'New curse', magic_create_type_path(:curse), :class => 'btn' %>
+	<%= link_to 'New potion', magic_create_type_path(:potion), :class => 'btn' %>
+</div>
+
diff --git a/config/routes.rb b/config/routes.rb
index b18553e9..1690b867 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -70,6 +70,7 @@ PlanCharacters::Application.routes.draw do
 		get    '/magic/from/:universe', :to => 'magic#index', :as => :magic_by_universe
 		get    '/magic/new',      :to => 'magic#new',     :as => :magic_create
 		post   '/magic/new',      :to => 'magic#create',  :as => :magic_create_process
+		get    '/magic/new/:type_of', :to => 'magic#new',     :as => :magic_create_type
 		get    '/magic/:id',      :to => 'magic#show',    :as => :magic
 		get    '/magic/:id/edit', :to => 'magic#edit',    :as => :magic_edit
 		put    '/magic/:id',      :to => 'magic#update',  :as => :magic_edit_process