diff --git a/app/views/auth_sources/index.html.erb b/app/views/auth_sources/index.html.erb
index ba1bd6296..e35e13c26 100644
--- a/app/views/auth_sources/index.html.erb
+++ b/app/views/auth_sources/index.html.erb
@@ -28,4 +28,4 @@
   </tbody>
 </table>
 
-<p class="pagination"><%= pagination_links_full @auth_source_pages %></p>
+<div class="pagination"><%= pagination_links_full @auth_source_pages %></div>
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 902dd31c1..e0ee2aab7 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -50,7 +50,7 @@
   <% end %>
   </tbody>
 </table>
-<p class="pagination"><%= pagination_links_full @topic_pages, @topic_count %></p>
+<div class="pagination"><%= pagination_links_full @topic_pages, @topic_count %></div>
 <% else %>
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
diff --git a/app/views/issue_statuses/index.html.erb b/app/views/issue_statuses/index.html.erb
index f0a5e850d..940e26549 100644
--- a/app/views/issue_statuses/index.html.erb
+++ b/app/views/issue_statuses/index.html.erb
@@ -34,6 +34,6 @@
   </tbody>
 </table>
 
-<p class="pagination"><%= pagination_links_full @issue_status_pages %></p>
+<div class="pagination"><%= pagination_links_full @issue_status_pages %></div>
 
 <% html_title(l(:label_issue_status_plural)) -%>
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 25ee3be08..0529de844 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -68,7 +68,7 @@
   <%= link_to_attachments message, :author => false %>
   </div>
 <% end %>
-<p class="pagination"><%= pagination_links_full @reply_pages, @reply_count, :per_page_links => false %></p>
+<div class="pagination"><%= pagination_links_full @reply_pages, @reply_count, :per_page_links => false %></div>
 <% end %>
 
 <% if !@topic.locked? && authorize_for('messages', 'reply') %>
diff --git a/app/views/newsold/index.html.erb b/app/views/newsold/index.html.erb
index 38eecd262..721c347e2 100644
--- a/app/views/newsold/index.html.erb
+++ b/app/views/newsold/index.html.erb
@@ -32,7 +32,7 @@
     </div>
 <% end %>
 <% end %>
-<p class="pagination"><%= pagination_links_full @news_pages %></p>
+<div class="pagination"><%= pagination_links_full @news_pages %></div>
 
 <% other_formats_links do |f| %>
   <%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %>
diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb
index ab27047ce..f752c7d0b 100644
--- a/app/views/projects/_form.html.erb
+++ b/app/views/projects/_form.html.erb
@@ -1,6 +1,8 @@
 <%= error_messages_for 'project' %>
 <!--[form:project]-->
+<% unless @project.new_record? %>
 <p><%= render :partial=>"avatar/avatar_form",:locals=> {source:@project} %></p>
+<% end %>
 <p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;" %></p>
 
 <p style="margin-left:-10px;padding-right: 20px;"><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %></p><!--by young-->
@@ -11,13 +13,6 @@
 <p style="margin-left:-10px;"><%= f.text_field :homepage, :size => 60, :style => "width:488px;margin-left: 10px;" %></p>
 <p style="margin-left:-10px;"><%= f.check_box :is_public, :style => "margin-left:10px;" %></p>
 
-<% unless @project.allowed_parents.compact.empty? %>
-    <p style="margin-left:-10px;"><%= label(:project, :parent_id, l(:field_parent)) %><span style="margin-left:10px;"><%= parent_project_select_tag(@project) %></span></p>
-<% end %>
-
-<% if @project.safe_attribute? 'inherit_members' %>
-<p style="padding-left: 150px;"><%= f.check_box :inherit_members %></p>
-<% end %>
 
 <%= wikitoolbar_for 'project_description' %>
 
diff --git a/app/views/repositories/revisions.html.erb b/app/views/repositories/revisions.html.erb
index 7a7338099..e89deeb7d 100644
--- a/app/views/repositories/revisions.html.erb
+++ b/app/views/repositories/revisions.html.erb
@@ -17,7 +17,7 @@
                        :revisions => @changesets,
                        :entry     => nil } %>
 
-<p class="pagination"><%= pagination_links_full @changeset_pages,@changeset_count %></p>
+<div class="pagination"><%= pagination_links_full @changeset_pages,@changeset_count %></div>
 
 <% content_for :header_tags do %>
   <%= stylesheet_link_tag "scm" %>
diff --git a/app/views/roles/index.html.erb b/app/views/roles/index.html.erb
index 6b35200cd..6b5277a27 100644
--- a/app/views/roles/index.html.erb
+++ b/app/views/roles/index.html.erb
@@ -29,6 +29,6 @@
   </tbody>
 </table>
 
-<p class="pagination"><%= pagination_links_full @role_pages %></p>
+<div class="pagination"><%= pagination_links_full @role_pages %></div>
 
 <% html_title(l(:label_role_plural)) -%>
diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb
index d73bd1302..a3eb7fa7d 100644
--- a/app/views/timelog/index.html.erb
+++ b/app/views/timelog/index.html.erb
@@ -18,7 +18,7 @@
 
 <% unless @entries.empty? %>
 <%= render :partial => 'list', :locals => { :entries => @entries }%>
-<p class="pagination"><%= pagination_links_full @entry_pages, @entry_count %></p>
+<div class="pagination"><%= pagination_links_full @entry_pages, @entry_count %></div>
 
 <% other_formats_links do |f| %>
   <%= f.link_to 'Atom', :url => params.merge({:issue_id => @issue, :key => User.current.rss_key}) %>
diff --git a/app/views/trackers/index.html.erb b/app/views/trackers/index.html.erb
index abcf84d82..5c43557fb 100644
--- a/app/views/trackers/index.html.erb
+++ b/app/views/trackers/index.html.erb
@@ -34,6 +34,6 @@
   </tbody>
 </table>
 
-<p class="pagination"><%= pagination_links_full @tracker_pages %></p>
+<div class="pagination"><%= pagination_links_full @tracker_pages %></div>
 
 <% html_title(l(:label_tracker_plural)) -%>