diff --git a/rpg-docs/client/views/character/buffs/buffViewList/buffViewList.html b/rpg-docs/client/views/character/buffs/buffViewList/buffViewList.html
index 394e7e4e..9998abf1 100644
--- a/rpg-docs/client/views/character/buffs/buffViewList/buffViewList.html
+++ b/rpg-docs/client/views/character/buffs/buffViewList/buffViewList.html
@@ -4,13 +4,24 @@
 			<div class="top white subhead layout horizontal center">
 					<div class="flex">Conditions</div>
 					{{#if canEditCharacter _id}}
-					<paper-icon-button class="black54" id="addBuff" icon="add"></paper-icon-button>
+					<paper-icon-button class="black54" id="addCondition" icon="add"></paper-icon-button>
 					{{/if}}
 				</div>
 			<div flex class="bottom list">
-				{{#each buffs}}
+				{{#each conditions}}
 					{{>buffView}}
 				{{/each}}
+
+				{{#if buffs.count}}
+					<div class="buffs">
+						<div class="paper-font-title" style="margin-bottom: 8px;">
+							Buffs
+						</div>
+						{{#each buffs}}
+							{{> buffView}}
+						{{/each}}
+					</div>
+				{/if}}
 			</div>
 		</paper-material>
 	</div>
diff --git a/rpg-docs/client/views/character/buffs/buffViewList/buffViewList.js b/rpg-docs/client/views/character/buffs/buffViewList/buffViewList.js
index e2f26d35..af07ae6c 100644
--- a/rpg-docs/client/views/character/buffs/buffViewList/buffViewList.js
+++ b/rpg-docs/client/views/character/buffs/buffViewList/buffViewList.js
@@ -1,18 +1,22 @@
 Template.buffViewList.helpers({
+	conditions: function(){
+		var selector = {
+			"charId": this._id,
+			"type": "inate",
+		};
+		return Buffs.find(selector);
+	},
 	buffs: function(){
 		var selector = {
-			// "parent.id": this.parentId,
 			"charId": this._id,
+			"type": "custom",
 		};
-		// if (this.parentGroup){
-		// 	selector["parent.group"] = this.parentGroup;
-		// }
 		return Buffs.find(selector);
 	}
 });
 
 Template.buffViewList.events({
-	"click #addBuff": function(event, template){
+	"click #addCondition": function(event, template){
 		pushDialogStack({
 			template: "conditionLibraryDialog",
 			element: event.currentTarget,