diff --git a/chrome/chromeFiles/content/scholar/itemPane.js b/chrome/chromeFiles/content/scholar/itemPane.js
index 00616a8b7..4d83d2875 100644
--- a/chrome/chromeFiles/content/scholar/itemPane.js
+++ b/chrome/chromeFiles/content/scholar/itemPane.js
@@ -43,6 +43,7 @@ ScholarItemPane = new function()
 	this.showEditor = showEditor;
 	this.hideEditor = hideEditor;
 	this.modifyField = modifyField;
+	this.getCreatorFields = getCreatorFields;
 	this.modifyCreator = modifyCreator;
 	this.removeNote = removeNote;
 	this.addNote = addNote;
@@ -100,6 +101,7 @@ ScholarItemPane = new function()
 			return;
 		_loaded[index] = true;
 		
+		// Info pane
 		if(index == 0)
 		{
 			while(_dynamicFields.hasChildNodes())
@@ -148,7 +150,7 @@ ScholarItemPane = new function()
 			}
 			else
 			{
-				addCreatorRow('', '', 1);
+				addCreatorRow('', '', 1, true, true);
 			}
 		}
 		else if(index == 1)
@@ -287,7 +289,7 @@ ScholarItemPane = new function()
 			_dynamicFields.appendChild(row);		
 	}
 	
-	function addCreatorRow(firstName, lastName, typeID)
+	function addCreatorRow(firstName, lastName, typeID, unsaved, defaultRow)
 	{
 		if(!firstName)
 			firstName = "(first)";
@@ -299,6 +301,7 @@ ScholarItemPane = new function()
 		label.setAttribute("fieldname",'creator-'+_creatorCount+'-typeID');
 		label.className = 'clicky';
 		
+		// getCreatorFields() needs to be adjusted if the DOM changes
 		var row = document.createElement("hbox");
 		
 		var firstlast = document.createElement("hbox");
@@ -309,14 +312,28 @@ ScholarItemPane = new function()
 		
 		var removeButton = document.createElement('label');
 		removeButton.setAttribute("value","-");
-		removeButton.setAttribute("class","clicky");
-		removeButton.setAttribute("onclick","ScholarItemPane.removeCreator("+_creatorCount+")");
+		if (defaultRow){
+			removeButton.setAttribute("disabled",true);
+			removeButton.setAttribute("class","unclicky");
+		}
+		else {
+			removeButton.setAttribute("class","clicky");
+			removeButton.setAttribute("onclick","ScholarItemPane.removeCreator("+_creatorCount+", this.parentNode.parentNode)");
+		}
 		row.appendChild(removeButton);
 		
 		var addButton = document.createElement('label');
 		addButton.setAttribute("value","+");
-		addButton.setAttribute("class","clicky");
-		addButton.setAttribute("onclick","ScholarItemPane.addCreatorRow('','',1);");
+		if (unsaved)
+		{
+			addButton.setAttribute("disabled",true);
+			addButton.setAttribute("class","unclicky");
+		}
+		else
+		{
+			addButton.setAttribute("class","clicky");
+			addButton.setAttribute("onclick","ScholarItemPane.addCreatorRow('','',1,true);");
+		}
 		row.appendChild(addButton);
 		
 		_creatorCount++;
@@ -348,8 +365,14 @@ ScholarItemPane = new function()
 		return valueElement;
 	}
 	
-	function removeCreator(index)
+	function removeCreator(index, labelToDelete)
 	{
+		// If unsaved row, just remove element
+		if (!_itemBeingEdited.hasCreatorAt(index)){
+			labelToDelete.parentNode.removeChild(labelToDelete);
+			_creatorCount--;
+			return;
+		}
 		_itemBeingEdited.removeCreator(index);
 		_itemBeingEdited.save();
 		loadPane(0);
@@ -398,7 +421,11 @@ ScholarItemPane = new function()
 			if(saveChanges)
 				modifyCreator(creatorFields[1],creatorFields[2],value);
 			
-			elem = createValueElement(_itemBeingEdited.getCreator(creatorFields[1])[creatorFields[2]], fieldName);
+			var val = _itemBeingEdited.getCreator(creatorFields[1])[creatorFields[2]];
+			if (creatorFields[2]=='lastName'){
+				val += ',';
+			}
+			elem = createValueElement(val, fieldName);
 		}
 		else
 		{
@@ -419,12 +446,34 @@ ScholarItemPane = new function()
 		_itemBeingEdited.save();
 	}
 	
-	function modifyCreator(index, field, value)
+	function getCreatorFields(row){
+		var label1 = row.getElementsByTagName('hbox')[0].firstChild.firstChild;
+		var label2 = label1.nextSibling;
+		
+		// doesn't currently return creator type, since we don't need it anywhere
+		return {
+			lastName: label1.firstChild ? label1.firstChild.nodeValue
+				// Strip trailing comma
+				.substr(0, label1.firstChild.nodeValue.length-1): label1.value,
+			firstName: label2.firstChild ? label2.firstChild.nodeValue
+				: label2.value,
+			isInstitution: null // placeholder
+		}
+	}
+	
+	function modifyCreator(index, field, value, otherFields)
 	{
-		var creator = _itemBeingEdited.getCreator(index);
-		var firstName = creator['firstName'];
-		var lastName = creator['lastName'];
-		var typeID = creator['typeID'];
+		if (otherFields){
+			var firstName = otherFields.firstName;
+			var lastName = otherFields.lastName;
+			// var isInstitution = otherFields.isInstitution;
+		}
+		else {
+			var creator = _itemBeingEdited.getCreator(index);
+			var firstName = creator['firstName'];
+			var lastName = creator['lastName'];
+			var typeID = creator['creatorTypeID'];
+		}
 		
 		if(field == 'firstName')
 			firstName = value;
diff --git a/chrome/chromeFiles/content/scholar/itemPane.xul b/chrome/chromeFiles/content/scholar/itemPane.xul
index 7d4a52f5e..d1143fd98 100644
--- a/chrome/chromeFiles/content/scholar/itemPane.xul
+++ b/chrome/chromeFiles/content/scholar/itemPane.xul
@@ -24,10 +24,13 @@
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 	
 	<script src="itemPane.js"/>	
-	<deck id="scholar-view-item" flex="1" onselect="ScholarItemPane.loadPane(this.selectedIndex);">
+	<deck id="scholar-view-item" flex="1">
 			<vbox id="scholar-info" flex="1">
 				<popupset>
-					<popup id="creatorTypeMenu" position="after_start" oncommand="ScholarItemPane.modifyCreator(document.popupNode.getAttribute('fieldname').split('-')[1],'typeID',event.explicitOriginalTarget.getAttribute('typeid'));"/>
+					<popup id="creatorTypeMenu" position="after_start"
+						oncommand="var otherFields = ScholarItemPane.getCreatorFields(document.popupNode.parentNode);
+							ScholarItemPane.modifyCreator(document.popupNode.getAttribute('fieldname').split('-')[1],
+								'typeID', event.explicitOriginalTarget.getAttribute('typeid'), otherFields)"/>
 				</popupset>
 				<hbox align="center">
 					<menulist id="editpane-type-menu" oncommand="ScholarItemPane.changeTypeTo(this.value)" flex="1">
diff --git a/chrome/chromeFiles/content/scholar/xpcom/data_access.js b/chrome/chromeFiles/content/scholar/xpcom/data_access.js
index 3a2037dc1..f006e4323 100644
--- a/chrome/chromeFiles/content/scholar/xpcom/data_access.js
+++ b/chrome/chromeFiles/content/scholar/xpcom/data_access.js
@@ -189,6 +189,15 @@ Scholar.Item.prototype.numCreators = function(){
 }
 
 
+Scholar.Item.prototype.hasCreatorAt = function(pos){
+	if (this.getID() && !this._creatorsLoaded){
+		this._loadCreators();
+	}
+	
+	return this._creators.has(pos);
+}
+
+
 /*
  * Returns an array of the creator data at the given position, or false if none
  *
@@ -468,7 +477,8 @@ Scholar.Item.prototype.save = function(){
 					Scholar.DB.query(sql2);
 					
 					// If empty, move on
-					if (!creator['firstName'] && !creator['lastName']){
+					if (typeof creator['firstName'] == 'undefined'
+						&& typeof creator['lastName'] == 'undefined'){
 						continue;
 					}
 					
@@ -2701,6 +2711,13 @@ Scholar.Creators = new function(){
 	 * Returns the creatorID matching given name and type
 	 */
 	function getID(firstName, lastName, isInstitution){
+		if (!firstName){
+			firstName = '';
+		}
+		if (!lastName){
+			lastName = '';
+		}
+		
 		if (isInstitution){
 			firstName = '';
 			isInstitution = 1;
diff --git a/chrome/chromeFiles/skin/default/scholar/scholar.css b/chrome/chromeFiles/skin/default/scholar/scholar.css
index 73bd4dcf5..0cce3ace0 100644
--- a/chrome/chromeFiles/skin/default/scholar/scholar.css
+++ b/chrome/chromeFiles/skin/default/scholar/scholar.css
@@ -73,19 +73,13 @@ searchcondition
 	-moz-binding: url('chrome://scholar/content/bindings/scholarsearch.xml#search-condition');
 }
 
-.clicky
+.clicky, .unclicky
 {	
 	-moz-border-radius: 6px;
 }
 
-.clicky[value="-"]
-{
-	margin: 0px;
-	padding-left: 4px;
-	padding-right: 4px;
-}
-
-.clicky[value="+"]
+.clicky[value="-"], .clicky[value="+"],
+.unclicky[value="-"], .unclicky[value="+"]
 {
 	margin: 0px;
 	padding-left: 4px;