diff --git a/rpg-docs/Model/Inventory/Containers.js b/rpg-docs/Model/Inventory/Containers.js
index c942e3a4..b473216d 100644
--- a/rpg-docs/Model/Inventory/Containers.js
+++ b/rpg-docs/Model/Inventory/Containers.js
@@ -2,9 +2,9 @@
 Containers = new Mongo.Collection("containers");
 
 Schemas.Container = new SimpleSchema({
-	name: 		{ type: String, trim: false },
-	charId: 	{ type: String, regEx: SimpleSchema.RegEx.Id},
-	isCarried: 	{ type: Boolean },
+	name:       { type: String, trim: false },
+	charId:     { type: String, regEx: SimpleSchema.RegEx.Id},
+	isCarried:  { type: Boolean },
 	weight:		{type: Number, min: 0, defaultValue: 0, decimal: true},
 	value:		{type: Number, min: 0, defaultValue: 0, decimal: true},
 	description:{type: String, optional: true, trim: false},
@@ -14,20 +14,26 @@ Schemas.Container = new SimpleSchema({
 Containers.attachSchema(Schemas.Container);
 
 Containers.helpers({
-	totalValue: function(){
-		var value = this.value;
+	contentsValue: function(){
+		var value = 0;
 		Items.find({"parent.id": this._id}, {fields: {quantity: 1, value: 1}}).forEach(function(item){
 			value += item.totalValue();
 		});
 		return value;
 	},
-	totalWeight: function(){
-		var weight = this.weight;
+	totalValue: function(){
+		return this.contentsValue() + this.value;
+	},
+	contentsWeight: function(){
+		var weight = 0;
 		Items.find({"parent.id": this._id}, {fields: {quantity: 1, weight: 1}}).forEach(function(item){
 			weight += item.totalWeight();
 		});
 		return weight;
 	},
+	totalWeight: function(){
+		return this.contentsWeight() + this.weight;
+	},
 	moveToCharacter: function(characterId){
 		if(this.charId === characterId) return;
 		Items.update(this._id, {$set: {charId: characterId}});
diff --git a/rpg-docs/client/globalHelpers/openParentDialog.js b/rpg-docs/client/globalHelpers/openParentDialog.js
new file mode 100644
index 00000000..68ca7b9f
--- /dev/null
+++ b/rpg-docs/client/globalHelpers/openParentDialog.js
@@ -0,0 +1,27 @@
+openParentDialog = function(parent, charId, heroId){
+	var detail;
+	if(parent.collection === "Characters" && parent.group === "racial"){
+		detail = {
+			template: "raceDialog",
+			data: {charId: parent.id},
+		};
+	} else if( parent.collection === "Features" ){
+		detail = {
+			template: "featureDialog",
+			data:     {featureId: parent.id},
+		};
+	} else if( parent.collection === "Classes" ){
+		detail = {
+			template: "classDialog",
+			data: {classId: parent.id},
+		};
+	} else if( parent.collection === "Items" ){
+		detail = {
+			template: "itemDialog",
+			data:     {itemId: parent.id},
+		};
+	}
+	detail.heroId = heroId;
+	detail.charId = charId;
+	GlobalUI.setDetail(detail);
+};
diff --git a/rpg-docs/client/globalHelpers/valueString.js b/rpg-docs/client/globalHelpers/valueString.js
index c99ceb0b..4b0dc703 100644
--- a/rpg-docs/client/globalHelpers/valueString.js
+++ b/rpg-docs/client/globalHelpers/valueString.js
@@ -21,4 +21,29 @@ Template.registerHelper("valueString", function(value){
 		result += resultArray[i];
 	}
 	return result;
-});
\ No newline at end of file
+});
+
+Template.registerHelper("longValueString", function(value){
+	var resultArray = [];
+	//sp
+	var gp = Math.floor(value);
+	if(gp > 0) resultArray.push(gp + "gp");
+	//sp
+	var sp = Math.floor(10 * (value % 1));
+	if(sp > 0 || resultArray.length) resultArray.push(sp + "sp");
+	//cp
+	var cp = 10 * ((value * 10) % 1);
+	cp = Math.round(cp * 1000) / 1000;
+	if(cp > 0 || resultArray.length) resultArray.push(cp + "cp");
+
+	//build string with correct spacing
+	var result = "";
+	for(var i = 0; i < resultArray.length; i++){
+		//add a space between values
+		if(i !== 0){
+			result += " ";
+		}
+		result += resultArray[i];
+	}
+	return result;
+});
diff --git a/rpg-docs/client/views/GeneralCSS/general.css b/rpg-docs/client/views/GeneralCSS/general.css
index b0f51b64..2e437c17 100644
--- a/rpg-docs/client/views/GeneralCSS/general.css
+++ b/rpg-docs/client/views/GeneralCSS/general.css
@@ -94,10 +94,14 @@ paper-button {
 	color: rgba(0, 0, 0, 0.54);
 }
 
-.statCard, .clickable {
+.clickable {
 	cursor: pointer;
 }
 
+.skillRow {
+	cursor: initial;
+}
+
 .resourceCards {
 	padding: 4px 4px 0 4px;
 	margin-bottom: -4px;
@@ -186,6 +190,8 @@ paper-slider {
 }
 
 .whiteTop {
+	cursor: initial;
+	border-bottom: black solid 0.5px;
 	border-bottom: rgba(0,0,0,0.12) solid 1px;
 	background: white;
 	padding: 16px;
diff --git a/rpg-docs/client/views/character/features/featureDialog/featureDialog.html b/rpg-docs/client/views/character/features/featureDialog/featureDialog.html
index 2f6d20ab..b4923a47 100644
--- a/rpg-docs/client/views/character/features/featureDialog/featureDialog.html
+++ b/rpg-docs/client/views/character/features/featureDialog/featureDialog.html
@@ -1,11 +1,9 @@
 <template name="featureDialog">
 	{{#with feature}}
-		{{#baseDialog title=name class=colorClass showEdit=true editing=editing}}
-			{{#if editing}}
-				{{> featureEdit}}
-			{{else}}
-				{{> featureDetails}}
-			{{/if}}
+		{{#baseDialog title=name class=colorClass startEditing=../startEditing}}
+			{{> featureDetails}}
+		{{else}}
+			{{> featureEdit}}
 		{{/baseDialog}}
 	{{/with}}
 </template>
diff --git a/rpg-docs/client/views/character/features/featureDialog/featureDialog.js b/rpg-docs/client/views/character/features/featureDialog/featureDialog.js
index 5ffa015e..d1faf4b3 100644
--- a/rpg-docs/client/views/character/features/featureDialog/featureDialog.js
+++ b/rpg-docs/client/views/character/features/featureDialog/featureDialog.js
@@ -1,11 +1,4 @@
-Template.featureDialog.onCreated(function(){
-	this.editing = new ReactiveVar(false);
-});
-
 Template.featureDialog.helpers({
-	editing: function(){
-		return Template.instance().editing.get();
-	},
 	feature: function(){
 		return Features.findOne(this.featureId);
 	},
@@ -15,12 +8,6 @@ Template.featureDialog.events({
 	"color-change": function(event, instance){
 		Features.update(instance.data.featureId, {$set: {color: event.color}});
 	},
-	"tap #editButton": function(event, instance){
-		instance.editing.set(true);
-	},
-	"tap #doneEditingButton": function(event, instance){
-		instance.editing.set(false);
-	},
 	"tap #deleteButton": function(event, instance){
 		Features.softRemoveNode(instance.data.featureId);
 		GlobalUI.deletedToast(instance.data.featureId, "Features", "Feature");
diff --git a/rpg-docs/client/views/character/features/features.js b/rpg-docs/client/views/character/features/features.js
index 3dc8f907..44a02841 100644
--- a/rpg-docs/client/views/character/features/features.js
+++ b/rpg-docs/client/views/character/features/features.js
@@ -40,7 +40,7 @@ Template.features.events({
 		var featureId = Features.insert({name: "New Feature", charId: this._id});
 		GlobalUI.setDetail({
 			template: "featureDialog",
-			data:     {featureId: featureId, charId: this._id},
+			data:     {featureId: featureId, charId: this._id, startEditing: true},
 			heroId:   featureId
 		});
 	},
@@ -68,13 +68,7 @@ Template.features.events({
 		});
 	},
 	"tap .attack": function(event){
-		var itemId = this.parent.id;
-		var charId = this.charId;
-		GlobalUI.setDetail({
-			template: "itemDialog",
-			data:     {itemId: itemId, charId: charId},
-			heroId:   this._id
-		});
+		openParentDialog(this.parent, this.charId, this._id);
 	},
 	"tap .useFeature": function(event){
 		var featureId = this._id;
diff --git a/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.css b/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.css
new file mode 100644
index 00000000..988b0159
--- /dev/null
+++ b/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.css
@@ -0,0 +1,8 @@
+.containerSummaryTable td{
+	text-align: right;
+	padding: 4px;
+}
+
+.containerSummaryTable td:first-child {
+	text-align: left;
+}
diff --git a/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html b/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html
index 5b13c831..f6ddfbc8 100644
--- a/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html
+++ b/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html
@@ -1,22 +1,46 @@
 <template name="containerDialog">
 	{{#with container}}
-		{{#baseDialog title=name class=colorClass}}
-			<!--Name and plural name-->
-			<paper-input id="containerNameInput" label="Name" floatinglabel value={{name}}></paper-input>
-			<!--Weight-->
-			<paper-input-decorator label="Weight" floatinglabel>
-				<input id="weightInput" type="number" value={{weight}}>
-			</paper-input-decorator>
-			<!--Value-->
-			<paper-input-decorator label="Value" floatinglabel>
-				<input id="valueInput" type="number" value={{value}}>
-			</paper-input-decorator>
-			<!--Description-->
-			<paper-input-decorator label="Description" floatinglabel layout vertical>
-				<paper-autogrow-textarea>
-					<textarea id="containerDescriptionInput" placeholder aria-label="Description" value={{description}}></textarea>
-				</paper-autogrow-textarea>
-			</paper-input-decorator>
+		{{#baseDialog title=name class=colorClass startEditing=../startEditing}}
+			{{> containerView}}
+		{{else}}
+			{{> containerEdit}}
 		{{/baseDialog}}
 	{{/with}}
-</template>
\ No newline at end of file
+</template>
+
+<template name="containerEdit">
+	<paper-input id="containerNameInput fullwidth"
+				 label="Name"
+				 floatinglabel
+				 value={{name}}></paper-input>
+	<div layout horizontal around-justified wrap>
+		<paper-input-decorator label="Weight" floatinglabel>
+			<input id="weightInput" type="number" value={{weight}}>
+		</paper-input-decorator>
+		<paper-input-decorator label="Value" floatinglabel>
+			<input id="valueInput" type="number" value={{value}}>
+		</paper-input-decorator>
+	</div>
+
+	<hr class="vertMargin">
+
+	<paper-input-decorator label="Description" floatinglabel layout vertical>
+		<paper-autogrow-textarea>
+			<textarea id="containerDescriptionInput" placeholder aria-label="Description" value={{description}}></textarea>
+		</paper-autogrow-textarea>
+	</paper-input-decorator>
+</template>
+
+<template name="containerView">
+	<div layout horizontal wrap center justified>
+		<table class="containerSummaryTable fullwidth">
+			<tr><td>Container</td><td>{{weight}}lbs</td><td>{{longValueString value}}</td></tr>
+			<tr><td>Contents</td><td>{{contentsWeight}}lbs</td><td>{{longValueString contentsValue}}</td></tr>
+			<tr class="body2"><td>Total</td><td>{{totalWeight}}lbs</td><td>{{longValueString totalValue}}</td></tr>
+		</table>
+	</div>
+	{{#if description}}
+		<hr class="vertMargin">
+		<div class="prewrap">{{description}}</div>
+	{{/if}}
+</template>
diff --git a/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.js b/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.js
index 7e112f42..05662f4e 100644
--- a/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.js
+++ b/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.js
@@ -4,7 +4,11 @@ Template.containerDialog.helpers({
 	}
 });
 
-Template.containerDialog.events({
+Template.containerEdit.onRendered(function(){
+	updatePolymerInputs(this);
+});
+
+Template.containerEdit.events({
 	"color-change": function(event, instance){
 		Containers.update(instance.data.containerId, {$set: {color: event.color}});
 	},
diff --git a/rpg-docs/client/views/character/inventory/inventory.css b/rpg-docs/client/views/character/inventory/inventory.css
index f7cb5b0a..5a041ec4 100644
--- a/rpg-docs/client/views/character/inventory/inventory.css
+++ b/rpg-docs/client/views/character/inventory/inventory.css
@@ -40,7 +40,6 @@ div#stats {
 
 .containerRight {
 	padding: 16px;
-	cursor: pointer;
 
 	/* same style as subhead */
 	font-size: 16px;
diff --git a/rpg-docs/client/views/character/inventory/inventory.js b/rpg-docs/client/views/character/inventory/inventory.js
index 65575356..c1450c8d 100644
--- a/rpg-docs/client/views/character/inventory/inventory.js
+++ b/rpg-docs/client/views/character/inventory/inventory.js
@@ -84,7 +84,7 @@ Template.inventory.events({
 			if(err) throw err;
 			GlobalUI.setDetail({
 				template: "itemDialog",
-				data:     {itemId: itemId, charId: charId},
+				data:     {itemId: itemId, charId: charId, startEditing: true},
 				heroId:   itemId
 			});
 		});
@@ -93,7 +93,7 @@ Template.inventory.events({
 		var containerId = Containers.insert({name: "New Container", isCarried: true, charId: this._id});
 		GlobalUI.setDetail({
 			template: "containerDialog",
-			data:     {containerId: containerId, charId: this.charId},
+			data:     {containerId: containerId, charId: this.charId, startEditing: true},
 			heroId:   containerId
 		});
 	},
diff --git a/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html b/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html
index 2e8508ac..47a21d86 100644
--- a/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html
+++ b/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html
@@ -1,11 +1,9 @@
 <template name="itemDialog">
 	{{#with item}}
-		{{#baseDialog title=itemHeading class=colorClass showEdit=true editing=editing}}
-			{{#if editing}}
-				{{> itemEdit}}
-			{{else}}
-				{{> itemDetails}}
-			{{/if}}
+		{{#baseDialog title=itemHeading class=colorClass startEditing=../startEditing}}
+			{{> itemDetails}}
+		{{else}}
+			{{> itemEdit}}
 		{{/baseDialog}}
 	{{/with}}
 </template>
diff --git a/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.js b/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.js
index 90f617fb..cb7a42b2 100644
--- a/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.js
+++ b/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.js
@@ -3,7 +3,7 @@ var getContainers = function(charId){
 };
 
 Template.itemDialog.onCreated(function(){
-	this.editing = new ReactiveVar(false);
+	this.editing = new ReactiveVar(!!this.data.startEditing);
 });
 
 Template.itemDialog.helpers({
diff --git a/rpg-docs/client/views/character/journal/classDialog/classDialog.html b/rpg-docs/client/views/character/journal/classDialog/classDialog.html
index 5352781b..292c3469 100644
--- a/rpg-docs/client/views/character/journal/classDialog/classDialog.html
+++ b/rpg-docs/client/views/character/journal/classDialog/classDialog.html
@@ -1,6 +1,18 @@
 <template name="classDialog">
 	{{#with class}}
-		{{#baseDialog title=name class=colorClass hideColor="true"}}
+		{{#baseDialog title=name class=colorClass startEditing=../startEditing}}
+			<div layout vertical center>
+				<div class="display2">
+					{{level}}
+				</div>
+				<div>
+					level
+				</div>
+			</div>
+
+			{{> effectsViewList charId=charId parentId=_id}}
+			{{> proficiencyViewList charId=charId parentId=_id}}
+		{{else}}
 			<!--Name-->
 			<paper-input id="classNameInput" label="Class Name" floatinglabel value={{name}}></paper-input>
 			<!--Level-->
diff --git a/rpg-docs/client/views/character/journal/classDialog/classDialog.js b/rpg-docs/client/views/character/journal/classDialog/classDialog.js
index 7f69e1df..365546aa 100644
--- a/rpg-docs/client/views/character/journal/classDialog/classDialog.js
+++ b/rpg-docs/client/views/character/journal/classDialog/classDialog.js
@@ -1,3 +1,7 @@
+Template.classDialog.onRendered(function(){
+	updatePolymerInputs(this);
+});
+
 Template.classDialog.events({
 	"tap #deleteButton": function(event, instance){
 		Classes.softRemoveNode(instance.data.classId);
diff --git a/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html b/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html
index 453bbee4..266675c1 100644
--- a/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html
+++ b/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html
@@ -1,6 +1,14 @@
 <template name="experienceDialog">
 	{{#with experience}}
-		{{#baseDialog title=name class=colorClass hideColor="true"}}
+		{{#baseDialog title=name class=colorClass hideColor="true" startEditing=../startEditing}}
+			<div horizontal layout center-justified>
+				{{value}}
+			</div>
+			{{#if description}}
+				<hr class="vertMargin">
+				<div class="prewrap">{{description}}</div>
+			{{/if}}
+		{{else}}
 			<div horizontal layout>
 				<!--Name-->
 				<paper-input id="experienceNameInput" label="Name" floatinglabel value={{name}} flex></paper-input>
diff --git a/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.js b/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.js
index 6aaec305..61376a36 100644
--- a/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.js
+++ b/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.js
@@ -1,3 +1,9 @@
+Template.experienceDialog.helpers({
+	feature: function(){
+		return Features.findOne(this.featureId);
+	},
+});
+
 Template.experienceDialog.events({
 	"tap #deleteButton": function(event, instance){
 		Experiences.softRemove(instance.data.experienceId);
diff --git a/rpg-docs/client/views/character/journal/journal.js b/rpg-docs/client/views/character/journal/journal.js
index 85499986..35191c56 100644
--- a/rpg-docs/client/views/character/journal/journal.js
+++ b/rpg-docs/client/views/character/journal/journal.js
@@ -76,7 +76,7 @@ Template.journal.events({
 			if(!error){
 				GlobalUI.setDetail({
 					template: "noteDialog",
-					data:     {noteId: id, charId: charId},
+					data:     {noteId: id, charId: charId, startEditing: true},
 					heroId:   id
 				});
 			}
@@ -90,11 +90,11 @@ Template.journal.events({
 			if(!error){
 				GlobalUI.setDetail({
 					template: "experienceDialog",
-					data: {experienceId: id, charId: charId},
+					data: {experienceId: id, charId: charId, startEditing: true},
 					heroId: id
 				});
 			}
-		})
+		});
 	},
 	"tap #addClassButton":function(event){
 		var charId = this._id;
@@ -106,11 +106,11 @@ Template.journal.events({
 			if(!error){
 				GlobalUI.setDetail({
 					template: "classDialog",
-					data: {classId: id, charId: charId},
+					data: {classId: id, charId: charId, startEditing: true},
 					heroId: id
 				});
 			}
-		})
+		});
 	},
 	"tap #moreExperiences": function(event){
 		var inst = Template.instance();
@@ -125,6 +125,6 @@ Template.journal.events({
 		}, 300);
 		//HACK giggle the columns :( to workaround chrome bug that stops .containers height from updating
 		var cs = inst.$(".containers").removeClass("containers");
-		_.defer(function(){cs.addClass("containers")});
+		_.defer(function(){cs.addClass("containers");});
 	}
 });
diff --git a/rpg-docs/client/views/character/journal/noteDialog/noteDialog.html b/rpg-docs/client/views/character/journal/noteDialog/noteDialog.html
index 158fb930..31425db6 100644
--- a/rpg-docs/client/views/character/journal/noteDialog/noteDialog.html
+++ b/rpg-docs/client/views/character/journal/noteDialog/noteDialog.html
@@ -1,6 +1,8 @@
 <template name="noteDialog">
 	{{#with note}}
-		{{#baseDialog title=name class=colorClass}}
+		{{#baseDialog title=name class=colorClass startEditing=../startEditing}}
+			<div class="prewrap">{{description}}</div>
+		{{else}}
 			<!--Name-->
 			<div horizontal layout>
 				<paper-input id="noteNameInput" label="Name" floatinglabel value={{name}} flex></paper-input>
@@ -8,7 +10,7 @@
 			<!--Description-->
 			<paper-input-decorator label="Description" floatinglabel layout vertical>
 				<paper-autogrow-textarea>
-					<textarea id="noteDescriptionInput" placeholder value={{description}}></textarea>
+					<textarea id="noteDescriptionInput" value={{description}}></textarea>
 				</paper-autogrow-textarea>
 			</paper-input-decorator>
 		{{/baseDialog}}
diff --git a/rpg-docs/client/views/character/journal/noteDialog/noteDialog.js b/rpg-docs/client/views/character/journal/noteDialog/noteDialog.js
index c935645c..c3684f87 100644
--- a/rpg-docs/client/views/character/journal/noteDialog/noteDialog.js
+++ b/rpg-docs/client/views/character/journal/noteDialog/noteDialog.js
@@ -1,3 +1,7 @@
+Template.noteDialog.onRendered(function(){
+	updatePolymerInputs(this);
+});
+
 Template.noteDialog.events({
 	"color-change": function(event, instance){
 		Notes.update(instance.data.noteId, {$set: {color: event.color}});
diff --git a/rpg-docs/client/views/character/journal/raceDialog/raceDialog.html b/rpg-docs/client/views/character/journal/raceDialog/raceDialog.html
index c2578049..035f24c3 100644
--- a/rpg-docs/client/views/character/journal/raceDialog/raceDialog.html
+++ b/rpg-docs/client/views/character/journal/raceDialog/raceDialog.html
@@ -1,5 +1,8 @@
 <template name="raceDialog">
-	{{#baseDialog title="Race" class=colorClass hideColor="true" hideDelete="true"}}
+	{{#baseDialog title="Race" class=colorClass hideColor="true" hideDelete="true" startEditing=startEditing}}
+		{{> effectsViewList charId=charId parentId=charId parentGroup="racial"}}
+		{{> proficiencyViewList charId=charId parentId=charId parentGroup="racial"}}
+	{{else}}
 		<paper-input id="raceInput" label="Race" floatinglabel value={{race}}></paper-input>
 		{{> effectsEditList parentId=charId parentCollection="Characters" charId=charId parentGroup="racial"}}
 		{{> proficiencyEditList parentId=charId parentCollection="Characters" charId=charId parentGroup="racial"}}
diff --git a/rpg-docs/client/views/character/journal/raceDialog/raceDialog.js b/rpg-docs/client/views/character/journal/raceDialog/raceDialog.js
index d53dc1e9..f4f5d2ca 100644
--- a/rpg-docs/client/views/character/journal/raceDialog/raceDialog.js
+++ b/rpg-docs/client/views/character/journal/raceDialog/raceDialog.js
@@ -1,3 +1,7 @@
+Template.raceDialog.onRendered(function(){
+	updatePolymerInputs(this);
+});
+
 Template.raceDialog.events({
 	"change #raceInput": function(event){
 		var value = event.currentTarget.value;
diff --git a/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.html b/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.html
index e5951e44..f1aed65b 100644
--- a/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.html
+++ b/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.html
@@ -1,5 +1,7 @@
 <template name="personaDetailsDialog">
-	{{#baseDialog title=name class="deep-purple white-text" hideColor="true" hideDelete="true"}}
+	{{#baseDialog title=name class="deep-purple white-text" hideColor="true" hideDelete="true" startEditing=startEditing}}
+		{{alignment}} {{gender}} {{race}}
+	{{else}}
 		<!--Name-->
 		<paper-input id="nameInput" label="Name" floatinglabel value={{name}}></paper-input><br>
 		<!--Alignment-->
diff --git a/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.js b/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.js
index 05258d8c..14e362b6 100644
--- a/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.js
+++ b/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.js
@@ -1,3 +1,7 @@
+Template.personaDetailsDialog.onRendered(function(){
+	updatePolymerInputs(this);
+});
+
 Template.personaDetailsDialog.events({
 	"change #nameInput": function(event){
 		var input = event.currentTarget.value;
diff --git a/rpg-docs/client/views/character/persona/persona.html b/rpg-docs/client/views/character/persona/persona.html
index edadc00d..800d3396 100644
--- a/rpg-docs/client/views/character/persona/persona.html
+++ b/rpg-docs/client/views/character/persona/persona.html
@@ -15,7 +15,7 @@
 					<div class="containerTop whiteTop" layout horizontal center>
 						<div class="containerName subhead" flex>Languages</div>
 					</div>
-					<div flex class="containerMain">
+					<div flex class="containerMain listPadded">
 						{{#each languages}}
 							{{> proficiencyListItem}}
 						{{/each}}
diff --git a/rpg-docs/client/views/character/persona/textDialog/textDialog.html b/rpg-docs/client/views/character/persona/textDialog/textDialog.html
index 99613b8a..0a65a927 100644
--- a/rpg-docs/client/views/character/persona/textDialog/textDialog.html
+++ b/rpg-docs/client/views/character/persona/textDialog/textDialog.html
@@ -1,5 +1,7 @@
 <template name="textDialog">
-	{{#baseDialog title=title class=colorClass hideColor="true" hideDelete="true"}}
+	{{#baseDialog title=title class=colorClass hideColor="true" hideDelete="true" startEditing=startEditing}}
+		<div class="prewrap">{{value}}</div>
+	{{else}}
 		<paper-input-decorator label={{title}} floatinglabel layout vertical>
 			<paper-autogrow-textarea>
 				<textarea id="textInput" placeholder value={{value}}></textarea>
diff --git a/rpg-docs/client/views/character/persona/textDialog/textDialog.js b/rpg-docs/client/views/character/persona/textDialog/textDialog.js
index 2e054e47..ed2c950c 100644
--- a/rpg-docs/client/views/character/persona/textDialog/textDialog.js
+++ b/rpg-docs/client/views/character/persona/textDialog/textDialog.js
@@ -1,3 +1,7 @@
+Template.textDialog.onRendered(function(){
+	updatePolymerInputs(this);
+});
+
 Template.textDialog.helpers({
 	value: function(){
 		var fieldSelector = {fields: {}};
diff --git a/rpg-docs/client/views/character/proficiencies/proficiencyEditList/proficiencyEditList.js b/rpg-docs/client/views/character/proficiencies/proficiencyEditList/proficiencyEditList.js
index 60fe8b01..e0d24257 100644
--- a/rpg-docs/client/views/character/proficiencies/proficiencyEditList/proficiencyEditList.js
+++ b/rpg-docs/client/views/character/proficiencies/proficiencyEditList/proficiencyEditList.js
@@ -1,7 +1,13 @@
 Template.proficiencyEditList.helpers({
 	proficiencies: function(){
-		var cursor = Proficiencies.find({"parent.id": this.parentId, "parent.collection": this.parentCollection});
-		return cursor;
+		var selector = {
+			"parent.id": this.parentId,
+			"charId": this.charId
+		};
+		if(this.parentGroup){
+			selector["parent.group"] = this.parentGroup;
+		}
+		return Proficiencies.find(selector);
 	}
 });
 
diff --git a/rpg-docs/client/views/character/proficiencies/proficiencyListItem/proficiencyListItem.html b/rpg-docs/client/views/character/proficiencies/proficiencyListItem/proficiencyListItem.html
index a2cf41a6..aac439eb 100644
--- a/rpg-docs/client/views/character/proficiencies/proficiencyListItem/proficiencyListItem.html
+++ b/rpg-docs/client/views/character/proficiencies/proficiencyListItem/proficiencyListItem.html
@@ -1,7 +1,7 @@
 <template name="proficiencyListItem">
 	<div class="itemSlot">
-		<paper-item noink class="white" hero-id="main" {{detailHero}}>
-			<core-icon icon="{{profIcon}}"></core-icon>
+		<paper-item noink class="white proficiencyItem" hero-id="main" {{detailHero}}>
+			<core-icon icon="{{profIcon}}" class="black54"></core-icon>
 			<div class="sideMargin">{{getName}}</div>
 		</paper-item>
 	</div>
diff --git a/rpg-docs/client/views/character/proficiencies/proficiencyListItem/proficiencyListItem.js b/rpg-docs/client/views/character/proficiencies/proficiencyListItem/proficiencyListItem.js
index 0728c378..2ac4a30c 100644
--- a/rpg-docs/client/views/character/proficiencies/proficiencyListItem/proficiencyListItem.js
+++ b/rpg-docs/client/views/character/proficiencies/proficiencyListItem/proficiencyListItem.js
@@ -12,3 +12,9 @@ Template.proficiencyListItem.helpers({
 		return this.name;
 	}
 });
+
+Template.proficiencyListItem.events({
+	"tap .proficiencyItem": function(event, instance){
+		openParentDialog(this.parent, this.charId, this._id);
+	}
+});
diff --git a/rpg-docs/client/views/character/proficiencies/proficiencyViewList/proficiencyViewList.js b/rpg-docs/client/views/character/proficiencies/proficiencyViewList/proficiencyViewList.js
index c343751c..fe432535 100644
--- a/rpg-docs/client/views/character/proficiencies/proficiencyViewList/proficiencyViewList.js
+++ b/rpg-docs/client/views/character/proficiencies/proficiencyViewList/proficiencyViewList.js
@@ -1,5 +1,12 @@
 Template.proficiencyViewList.helpers({
 	proficiencies: function(){
-		return Proficiencies.find({"parent.id": this.parentId, charId: this.charId});
+		var selector = {
+			"parent.id": this.parentId,
+			"charId": this.charId
+		};
+		if(this.parentGroup){
+			selector["parent.group"] = this.parentGroup;
+		}
+		return Proficiencies.find(selector);
 	}
 });
diff --git a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html b/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
index 9af4fa71..0bccae65 100644
--- a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
+++ b/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
@@ -1,11 +1,9 @@
 <template name="spellDialog">
 	{{#with spell}}
-		{{#baseDialog title=name class=colorClass showEdit=true editing=editing}}
-			{{#if editing}}
-				{{> spellEdit}}
-			{{else}}
-				{{> spellDetails}}
-			{{/if}}
+		{{#baseDialog title=name class=colorClass  startEditing=../startEditing}}
+			{{> spellDetails}}
+		{{else}}
+			{{> spellEdit}}
 		{{/baseDialog}}
 	{{/with}}
 </template>
diff --git a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.js b/rpg-docs/client/views/character/spells/spellDialog/spellDialog.js
index 6894bd53..314485d9 100644
--- a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.js
+++ b/rpg-docs/client/views/character/spells/spellDialog/spellDialog.js
@@ -11,30 +11,16 @@ var spellLevels = [
 	{ name: "Level 9",  level: 9 },
 ];
 
-
-Template.spellDialog.onCreated(function(){
-	this.editing = new ReactiveVar(false);
-});
-
 Template.spellDialog.helpers({
 	spell: function(){
 		return Spells.findOne(this.spellId);
-	},
-	editing: function(){
-		return Template.instance().editing.get();
-	},
+	}
 });
 
 Template.spellDialog.events({
 	"color-change": function(event, instance){
 		Spells.update(instance.data.spellId, {$set: {color: event.color}});
 	},
-	"tap #editButton": function(event, instance){
-		instance.editing.set(true);
-	},
-	"tap #doneEditingButton": function(event, instance){
-		instance.editing.set(false);
-	},
 	"tap #deleteButton": function(event, instance){
 		Spells.softRemoveNode(instance.data.spellId);
 		GlobalUI.deletedToast(instance.data.spellId, "Spells", "Spell");
diff --git a/rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.html b/rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.html
index baabd527..af755652 100644
--- a/rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.html
+++ b/rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.html
@@ -1,27 +1,51 @@
 <template name="spellListDialog">
 	{{#with spellList}}
-		{{#baseDialog title=name class=colorClass}}
-			<!--Name-->
-			<div horizontal layout>
-				<paper-input id="spellListNameInput" label="Name" floatinglabel value={{name}} flex></paper-input>
+		{{#baseDialog title=name class=colorClass startEditing=../startEditing}}
+			<div>
+				<div layout horizontal justified wrap class="subhead">
+					{{#if attackBonus}}
+						<div>
+							Attack Bonus: {{evaluate charId attackBonus}}
+						</div>
+					{{/if}}
+					{{#if saveDC}}
+						<div>
+							Save DC: {{evaluate charId saveDC}}
+						</div>
+					{{/if}}
+					{{#if maxPrepared}}
+						<div>
+							Max Prepared: {{evaluateSigned charId maxPrepared}}
+						</div>
+					{{/if}}
+				</div>
+				<hr class="vertMargin">
+				<div class="prewrap">{{description}}</div>
 			</div>
+		{{else}}
+			<!--Name-->
+			<paper-input id="spellListNameInput"
+						 class="fullwidth"
+						 label="Name"
+						 floatinglabel
+						 value={{name}}></paper-input>
 			<!--Save DC-->
-			<paper-input id="spellListSaveDCInput" 
-						 label="Save DC" 
-						 floatinglabel 
-						 value={{saveDC}} 
+			<paper-input id="spellListSaveDCInput"
+						 label="Save DC"
+						 floatinglabel
+						 value={{saveDC}}
 						 style="width: 100%;"></paper-input><br>
 			<!--Attack Bonus-->
-			<paper-input id="spellListAttackBonusInput" 
-						 label="Attack Bonus" 
-						 floatinglabel 
-						 value={{attackBonus}} 
+			<paper-input id="spellListAttackBonusInput"
+						 label="Attack Bonus"
+						 floatinglabel
+						 value={{attackBonus}}
 						 style="width: 100%;"></paper-input><br>
 			<!--Max Prepared-->
-			<paper-input id="spellListMaxPreparedInput" 
-						 label="Maximum Prepared Spells" 
-						 floatinglabel 
-						 value={{maxPrepared}} 
+			<paper-input id="spellListMaxPreparedInput"
+						 label="Maximum Prepared Spells"
+						 floatinglabel
+						 value={{maxPrepared}}
 						 style="width: 100%;"></paper-input><br>
 			<!--Description-->
 			<paper-input-decorator label="Description" floatinglabel layout vertical>
diff --git a/rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.js b/rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.js
index fe524255..c8834d90 100644
--- a/rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.js
+++ b/rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.js
@@ -1,3 +1,7 @@
+Template.spellListDialog.onRendered(function(){
+	updatePolymerInputs(this);
+});
+
 Template.spellListDialog.events({
 	"color-change": function(event, instance){
 		SpellLists.update(instance.data.spellListId, {$set: {color: event.color}});
@@ -5,28 +9,28 @@ Template.spellListDialog.events({
 	"tap #deleteButton": function(event, instance){
 		SpellLists.softRemoveNode(instance.data.spellListId);
 		GlobalUI.deletedToast(instance.data.spellListId, "SpellLists", "Spell list and contents");
-		GlobalUI.closeDetail()
+		GlobalUI.closeDetail();
 	},
 	//TODO clean up String -> num here so they don't need casting by Schema.clean
 	//TODO validate input (integer, non-negative, etc) for these inputs and give validation errors
 	"change #spellListNameInput, input #spellListNameInput": function(event){
-		var value = event.currentTarget.value
+		var value = event.currentTarget.value;
 		SpellLists.update(this._id, {$set: {name: value}});
 	},
 	"change #spellListSaveDCInput, input #spellListSaveDCInput": function(event){
-		var value = event.currentTarget.value
+		var value = event.currentTarget.value;
 		SpellLists.update(this._id, {$set: {saveDC: value}});
 	},
 	"change #spellListAttackBonusInput, input #spellListAttackBonusInput": function(event){
-		var value = event.currentTarget.value
+		var value = event.currentTarget.value;
 		SpellLists.update(this._id, {$set: {attackBonus: value}});
 	},
 	"change #spellListMaxPreparedInput, input #spellListMaxPreparedInput": function(event){
-		var value = event.currentTarget.value
+		var value = event.currentTarget.value;
 		SpellLists.update(this._id, {$set: {maxPrepared: value}});
 	},
 	"change #spellListDescriptionInput": function(event){
-		var value = event.currentTarget.value
+		var value = event.currentTarget.value;
 		SpellLists.update(this._id, {$set: {description: value}});
 	},
 });
diff --git a/rpg-docs/client/views/character/spells/spells.js b/rpg-docs/client/views/character/spells/spells.js
index d635bbc8..0006edc2 100644
--- a/rpg-docs/client/views/character/spells/spells.js
+++ b/rpg-docs/client/views/character/spells/spells.js
@@ -161,7 +161,7 @@ Template.spells.events({
 			if(!error){
 				GlobalUI.setDetail({
 					template: "spellListDialog",
-					data:     {spellListId: id, charId: charId},
+					data:     {spellListId: id, charId: charId, startEditing: true},
 					heroId:   id
 				});
 			}
@@ -182,7 +182,7 @@ Template.spells.events({
 			if(!error){
 				GlobalUI.setDetail({
 					template: "spellDialog",
-					data:     {spellId: id, charId: charId},
+					data:     {spellId: id, charId: charId, startEditing: true},
 					heroId:   id
 				});
 			}
diff --git a/rpg-docs/client/views/character/stats/stats.html b/rpg-docs/client/views/character/stats/stats.html
index 82b795da..4d807a90 100644
--- a/rpg-docs/client/views/character/stats/stats.html
+++ b/rpg-docs/client/views/character/stats/stats.html
@@ -11,7 +11,7 @@
 			{{> abilityMiniCard ability="intelligence" title="Intelligence" color="deep-orange"}}
 			{{> abilityMiniCard ability="wisdom" title="Wisdom" color="purple"}}
 			{{> abilityMiniCard ability="charisma" title="Charisma" color="pink"}}
-			
+
 			<!--Armor-->
 			{{> statCard stat="armor" name="Armor Class" color="teal"}}
 			<!--Speed-->
@@ -20,7 +20,7 @@
 			{{> statCard stat="initiative" name="Initiative" color="indigo" isSkill="true"}}
 			<!--Proficiency Bonus-->
 			{{> statCard stat="proficiencyBonus" name="Proficiency Bonus" color="blue" prefix="+"}}
-			
+
 			<!--Hit Dice-->
 			{{>hitDice name="d6HitDice" diceNum="6" char=this}}
 			{{>hitDice name="d8HitDice" diceNum="8" char=this}}
@@ -28,7 +28,7 @@
 			{{>hitDice name="d12HitDice" diceNum="12" char=this}}
 			<!--Saving Throws-->
 			<paper-shadow class="card container"  hero-id="main" {{detailHero}}>
-				<div class="containerTop teal white-text" layout horizontal center>
+				<div class="containerTop whiteTop" layout horizontal center>
 					<div class="containerName subhead" hero-id="title" flex>Saving Throws</div>
 				</div>
 				<div flex class="containerMain">
@@ -42,7 +42,7 @@
 			</paper-shadow>
 			<!--Skills-->
 			<paper-shadow class="card container"  hero-id="main" {{detailHero}}>
-				<div class="containerTop blue white-text" layout horizontal center>
+				<div class="containerTop whiteTop" layout horizontal center>
 					<div class="containerName subhead" hero-id="title" flex>Skills</div>
 				</div>
 				<div flex class="containerMain">
diff --git a/rpg-docs/client/views/character/stats/stats.js b/rpg-docs/client/views/character/stats/stats.js
index 4dbd1407..92507f5b 100644
--- a/rpg-docs/client/views/character/stats/stats.js
+++ b/rpg-docs/client/views/character/stats/stats.js
@@ -1,5 +1,7 @@
 Template.stats.events({
 	"tap .statCard": function(event, instance){
+		//TODO reimplement this when the dialog is nice
+		return;
 		if(this.isSkill){
 			var charId = instance.data._id;
 			GlobalUI.setDetail({
@@ -10,6 +12,8 @@ Template.stats.events({
 		}
 	},
 	"tap .skillRow": function(event, instance){
+		//TODO reimplement this when the dialog is nice
+		return;
 		var skill = this.skill;
 		var charId = instance.data._id;
 		GlobalUI.setDetail({
diff --git a/rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.html b/rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.html
index 20903364..ad40f9a7 100644
--- a/rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.html
+++ b/rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.html
@@ -3,30 +3,7 @@
 		<core-toolbar class={{class}} hero-id="toolbar" hero>
 			<paper-icon-button id="backButton" role="button" tabindex="0" icon="arrow-back" aria-label="close"></paper-icon-button>
 			<div flex>{{title}}</div>
-			{{#if showEdit}}
-				{{#if editing}}
-					{{#unless hideDelete}}
-						<paper-icon-button id="deleteButton"
-										   role="button"
-										   tabindex="0"
-										   icon="delete"
-										   aria-label="Delete Feature"
-										   noink></paper-icon-button>
-					{{/unless}}
-					{{#unless hideColor}}
-						{{> colorDropdown}}
-					{{/unless}}
-					<paper-icon-button id="doneEditingButton"
-									   icon="done"
-									   aria-label="Delete Feature"
-									   noink></paper-icon-button>
-				{{else}}
-					<paper-icon-button id="editButton"
-									   icon="create"
-									   aria-label="Delete Feature"
-									   noink></paper-icon-button>
-				{{/if}}
-			{{else}}
+			{{#if editing}}
 				{{#unless hideDelete}}
 					<paper-icon-button id="deleteButton"
 									   role="button"
@@ -38,10 +15,25 @@
 				{{#unless hideColor}}
 					{{> colorDropdown}}
 				{{/unless}}
+					<paper-icon-button id="doneEditingButton"
+									   icon="done"
+									   aria-label="Delete Feature"
+									   noink></paper-icon-button>
+			{{else}}
+				{{#unless hideEdit}}
+					<paper-icon-button id="editButton"
+									   icon="create"
+									   aria-label="Delete Feature"
+									   noink></paper-icon-button>
+				{{/unless}}
 			{{/if}}
 		</core-toolbar>
 		<div class="detailContent">
-			{{> UI.contentBlock}}
+			{{#unless editing}}
+				{{> UI.contentBlock}}
+			{{else}}
+				{{> UI.elseBlock}}
+			{{/unless}}
 		</div>
 	</core-header-panel>
 </template>
\ No newline at end of file
diff --git a/rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.js b/rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.js
index 63b3ac96..8d12bc0d 100644
--- a/rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.js
+++ b/rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.js
@@ -1,14 +1,26 @@
+Template.baseDialog.onCreated(function(){
+	this.editing = new ReactiveVar(!!this.data.startEditing);
+});
+
 Template.baseDialog.onRendered(function(){
-	updatePolymerInputs(this);
 	//after the dialog is built, open it
-	if (!this.alreadyRendered){
-		Session.set("global.ui.detailShow", true);
-		this.alreadyRendered = true;
-	}
+	Session.set("global.ui.detailShow", true);
+});
+
+Template.baseDialog.helpers({
+	editing: function(){
+		return Template.instance().editing.get();
+	},
 });
 
 Template.baseDialog.events({
 	"tap #backButton": function(){
 		GlobalUI.closeDetail();
-	}
+	},
+	"tap #editButton": function(event, instance){
+		instance.editing.set(true);
+	},
+	"tap #doneEditingButton": function(event, instance){
+		instance.editing.set(false);
+	},
 });