diff --git a/app/views/pages/_form.html.erb b/app/views/pages/_form.html.erb
index 9f7abed..6749c25 100644
--- a/app/views/pages/_form.html.erb
+++ b/app/views/pages/_form.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 <div class="control-group">
 	<% if params[:action] == "new" %>
-		<%= f.label :name, content_tag(:i, nil, :class => "icons-star") + t(:name) %>
+		<%= f.label :name, content_tag(:i, nil, :class => "icons-star") + t(:page)+' ID' %>
 		<div class="controls">
 			<%= f.text_field :page_id, class:"input-xlarge change", data: {"fv-validation" => "required;nospace;pageid_validation;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces.;Page id is already taken.;"} %>
 			<span class="help-block"><%= t("front_page.name_field_helper") %></span>
diff --git a/app/views/pages/_form_link.html.erb b/app/views/pages/_form_link.html.erb
index ce59176..471f793 100644
--- a/app/views/pages/_form_link.html.erb
+++ b/app/views/pages/_form_link.html.erb
@@ -3,9 +3,10 @@
 <% end %>
 <div class="control-group">
 	<% if params[:action] == "new" %>
-		<%= f.label :name, content_tag(:i, nil, :class => "icons-star") + t(:name) %>
+		<%= f.label :name, content_tag(:i, nil, :class => "icons-star")+t(:link)+' ID' %>
 		<div class="controls">
 			<%= f.text_field :page_id, class: "input-xlarge change", data: {"fv-validation" => "required;nospace;pageid_validation;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces;Page id is already taken.;"} %>
+			<span class="help-block"><%= t("front_page.name_field_helper") %></span>
 		</div>
 	<% end %>
 	<div class="controls">
@@ -16,7 +17,7 @@
 
 <div class="control-group">
 	<% @site_in_use_locales.each do |locale| %>
-	<label class="control-label">Link name (<%= t(locale.to_s) %>) :</label>
+	<label class="control-label"><%= "#{t(:title)} #{t(locale)}" %></label>
  	<div class="controls">
 		<%= f.fields_for :name_translations do |n| %>
 			<%= n.text_field locale, class:"input-xlarge change",  data: {"fv-validation" => "required;", "fv-messages" => "Cannot be empty.;"}, :value=>@page.name_translations[locale] rescue nil %>
@@ -26,11 +27,11 @@
 </div>
 <div class="control-group">
 	<% @site_in_use_locales.each do |locale| %>
-	<label class="control-label">Url (<%= t(locale.to_s) %>) :</label>
+	<label class="control-label"><%= "#{t(:url)} #{t(locale)}" %></label>
  	<div class="controls">
 		<%= f.fields_for :external_url_translations do |n| %>
 			<% 
-				if params[:action] == "edit"
+				if params[:action] == "edit" and !@page.external_url_translations[locale].blank?
 					temp_url = @page.external_url_translations[locale] 
 					temp_url = URI.parse(temp_url)
 					url = ""
diff --git a/app/views/pages/edit.html.erb b/app/views/pages/edit.html.erb
index 616384b..cd95d33 100644
--- a/app/views/pages/edit.html.erb
+++ b/app/views/pages/edit.html.erb
@@ -1,22 +1,18 @@
 <%= form_for @page, url: {action: "update"},:class =>"form-horizontal", remote: true do |f| %>
-	<% if params[:type] == "page" %>
-		<%= render "form", {:f=> f} %>
-	<% elsif params[:type] == "link" %>
-		<%= render "form_link", {:f=> f} %>
-	<% end %>
-	
-	<div class="form-actions">
-		<% if params[:type] == "page" %>
-			<a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a>
-      <%= f.submit t(:submit), class: 'btn btn-primary btn-small' %>
-		<% elsif params[:type] == "link" %>
-			<%= f.submit "Update Link", :class=>"btn btn-primary" %>
-		<% end %>
-	</div>
-	
+  <% if params[:type] == "page" %>
+    <%= render "form", {:f=> f} %>
+  <% elsif params[:type] == "link" %>
+    <%= render "form_link", {:f=> f} %>
+  <% end %>
+  
+  <div class="form-actions">
+    <a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a>
+    <%= f.submit t(:submit), class: 'btn btn-primary btn-small' %>
+  </div>
+  
 <% end %>
-<script type="text/javascript">	
+<script type="text/javascript"> 
 $(document).ready(function(){
-	var fromvalidator = new FormValidator($("form.edit_page"));
+  var fromvalidator = new FormValidator($("form.edit_page"));
 })
 </script>
\ No newline at end of file
diff --git a/app/views/pages/new.html.erb b/app/views/pages/new.html.erb
index 7358630..db9a35d 100644
--- a/app/views/pages/new.html.erb
+++ b/app/views/pages/new.html.erb
@@ -1,25 +1,21 @@
 <%= form_for @page, url: {action: "create"},:class =>"form-horizontal", :remote => true do |f| %>
-	<% if params[:type] == "page" %>
-		<%= render "form", {:f=> f} %>
-	<% elsif params[:type] == "link" %>
-		<%= render "form_link", {:f=> f} %>
-	<% end %>
-	
-	<div class="form-actions">
-  	<% if params[:type] == "page" %>
-			<a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a>
-      <%= f.submit t(:submit), class: 'btn btn-primary btn-small' %>
-		<% elsif params[:type] == "link" %>
-			<%= f.submit "Create Link", :class=>"btn btn-primary" %>
-		<% end %>
-	</div>
+  <% if params[:type] == "page" %>
+    <%= render "form", {:f=> f} %>
+  <% elsif params[:type] == "link" %>
+    <%= render "form_link", {:f=> f} %>
+  <% end %>
+  
+  <div class="form-actions">
+    <a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a>
+    <%= f.submit t(:submit), class: 'btn btn-primary btn-small' %>
+  </div>
 <% end %>
-<script type="text/javascript">	
+<script type="text/javascript"> 
 $(document).ready(function(){
-	var pageids = <%= Page.all.collect{|page| page.page_id}.to_json.html_safe %>
-	var fromvalidator = new FormValidator($("#new_page"));
-	fromvalidator.validate_functions.pageid_validation = function(value){
-		return (pageids.indexOf(value) == -1 ? true : false);
-	}
+  var pageids = <%= Page.all.collect{|page| page.page_id}.to_json.html_safe %>
+  var fromvalidator = new FormValidator($("#new_page"));
+  fromvalidator.validate_functions.pageid_validation = function(value){
+    return (pageids.indexOf(value) == -1 ? true : false);
+  }
 })
 </script>
\ No newline at end of file