diff --git a/app/views/weekly_time_sheet/_enter.html.erb b/app/views/weekly_time_sheet/_enter.html.erb
index b0c84a4..300795d 100644
--- a/app/views/weekly_time_sheet/_enter.html.erb
+++ b/app/views/weekly_time_sheet/_enter.html.erb
@@ -6,9 +6,16 @@
       <label for="entry_project"><%=l 'field_project' %></label>
       <select id="entry_project" name="entry[project_id]" onchange="MyWeeklyTimeEntry.projectChanged()">
         <option value="">--- <%=l 'actionview_instancetag_blank_option' %> ---</option>
-        <% Project.find(:all, :conditions => Project.visible_by, :order => 'lft').each do |prj| %>
-        <option value="<%= prj.id %>" <%= 'selected="selected"' if prj.id == @entry.project_id %>><%= prj.to_s %></option>
-        <% end %>
+	<% 
+	projects = User.current.projects.all
+    	if projects.any?
+	  s = ''
+      	  s << project_tree_options_for_select(projects, :selected => @project) do |p|
+            { :value => p.id }
+      	  end
+        end
+	%>
+	<%= s %>
       </select>
     </p>
     <p>
@@ -37,4 +44,4 @@
     <%= submit_tag l(:button_save) %>
     </p>
   </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/views/weekly_time_sheet/_entries.html.erb b/app/views/weekly_time_sheet/_entries.html.erb
index a5eb166..9a888a2 100644
--- a/app/views/weekly_time_sheet/_entries.html.erb
+++ b/app/views/weekly_time_sheet/_entries.html.erb
@@ -27,7 +27,13 @@ current_project_id = nil
       <%=h entry.hours %>
     </td>
     <td>
-      <a href="#" onclick="return MyWeeklyTimeEntry.deleteTime(<%= entry.id %>)"><%=l 'button_delete' %></a>
+      <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry, :project_id => nil},
+                                         :title => l(:button_edit) %>
+      <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry, :project_id => nil},
+                                           :confirm => l(:text_are_you_sure),
+                                           :method => :post,
+                                           :title => l(:button_delete) %>
+
     </td>
   </tr>
   
diff --git a/config/locales/en.yml b/config/locales/en.yml
new file mode 100644
index 0000000..3fc9a34
--- /dev/null
+++ b/config/locales/en.yml
@@ -0,0 +1,2 @@
+en:
+  redmine_weekly_time_sheet_title: "Log Time"
diff --git a/config/routes.rb b/config/routes.rb
new file mode 100644
index 0000000..5687845
--- /dev/null
+++ b/config/routes.rb
@@ -0,0 +1,7 @@
+ActionController::Routing::Routes.draw do |map|
+  map.resources :weekly_time_sheet
+  map.connect 'weekly_time_sheet', :controller => 'weekly_time_sheet', :action => 'index'
+  map.connect 'delete_item', :controller => 'weekly_time_sheet', :action => 'delete_item'
+  map.connect 'project_tasks/:id', :controller => 'weekly_time_sheet', :action => 'project_tasks'
+  map.connect 'submit_time', :controller => 'weekly_time_sheet', :action => 'submit_time'
+end
diff --git a/init.rb b/init.rb
index 85881cb..8580498 100644
--- a/init.rb
+++ b/init.rb
@@ -8,7 +8,7 @@
   
   menu(:top_menu,
        :weekly_time_sheet,
-       {:controller => 'weekly_time_sheet ', :action => 'index'},
+       {:controller => 'weekly_time_sheet', :action => 'index'},
        :caption => :redmine_weekly_time_sheet_title,
        :if => Proc.new {
          User.current.allowed_to?(:log_time, nil, :global => true) ||