diff --git a/admin/assets/js/um-admin-dragdrop.js b/admin/assets/js/um-admin-dragdrop.js
index 2f1f215f..42d8de82 100644
--- a/admin/assets/js/um-admin-dragdrop.js
+++ b/admin/assets/js/um-admin-dragdrop.js
@@ -240,7 +240,7 @@ function UM_Rows_Refresh(){
 
 function UM_Add_Icon(){
 
-	var add_icon_html = '<a href="#" class="um-admin-drag-add-field" data-modal="UM_fields" data-modal-size="normal" data-dynamic-content="um_admin_show_fields" data-arg2="'+jQuery('.um-admin-drag-ajax').data('form_id')+'" data-arg1=""><i class="um-icon-plus-add"></i></a>';
+	var add_icon_html = '<a href="#" class="um-admin-drag-add-field um-admin-tipsy-n" title="Add Field" data-modal="UM_fields" data-modal-size="normal" data-dynamic-content="um_admin_show_fields" data-arg2="'+jQuery('.um-admin-drag-ajax').data('form_id')+'" data-arg1=""><i class="um-icon-plus-add"></i></a>';
 		
 	jQuery('.um-admin-drag-col').each(function(){
 		if ( jQuery(this).find('.um-admin-drag-add-field').length == 0 ) {
diff --git a/admin/assets/js/um-admin-form.js b/admin/assets/js/um-admin-form.js
index f674c3c5..dcfa893f 100644
--- a/admin/assets/js/um-admin-form.js
+++ b/admin/assets/js/um-admin-form.js
@@ -18,7 +18,7 @@ jQuery(document).ready(function() {
 	}
 	
 	/* Creating new form button */
-	jQuery('.um-admin-boxed-links a').click(function(){
+	jQuery('.um-admin-boxed-links:not(.is-core-form) a').click(function(){
 		
 		var tab = jQuery(this);
 			
diff --git a/admin/templates/form/builder.php b/admin/templates/form/builder.php
index dd4309e8..6a156fea 100644
--- a/admin/templates/form/builder.php
+++ b/admin/templates/form/builder.php
@@ -25,7 +25,7 @@
 			
 		</div>
 		
-		<div class="um-admin-drag-addrow" data-row_action="add_row"><i class="um-icon-plus-add"></i></div>
+		<div class="um-admin-drag-addrow um-admin-tipsy-n" title="<?php _e('Add Master Row','ultimatemember'); ?>" data-row_action="add_row"><i class="um-icon-plus-add"></i></div>
 	
 	</div>
 
diff --git a/admin/templates/form/mode.php b/admin/templates/form/mode.php
index 32748700..e64488bc 100644
--- a/admin/templates/form/mode.php
+++ b/admin/templates/form/mode.php
@@ -1,5 +1,11 @@
-<div class="um-admin-boxed-links um-admin-ajaxlink">
+<?php $is_core = get_post_meta( get_the_ID(), '_um_core', true ); ?>
 
+<div class="um-admin-boxed-links um-admin-ajaxlink <?php if ( $is_core ) echo 'is-core-form'; ?>">
+
+	<?php if ( $is_core ) { ?>
+	<p><?php _e('<strong>Note:</strong> Form type cannot be changed for the default forms.','ultimatemember'); ?></p>
+	<?php } ?>
+	
 	<a href="#" data-role="register"><?php echo $ultimatemember->form->display_form_type_icon('register', get_the_ID() ); ?><?php _e('Registration Form','ultimatemember'); ?></a>
 	
 	<a href="#" data-role="profile"><?php echo $ultimatemember->form->display_form_type_icon('profile', get_the_ID() ); ?><?php _e('Profile Form','ultimatemember'); ?></a>