diff --git a/PivotSubscriptions/EventLog.cls b/PivotSubscriptions/EventLog.cls
index 7887903..e39612f 100644
--- a/PivotSubscriptions/EventLog.cls
+++ b/PivotSubscriptions/EventLog.cls
@@ -19,7 +19,7 @@ Property Hour As %Integer(MAXVAL = 23, MINVAL = 0);
 
 Property Minute As %Integer(MAXVAL = 59, MINVAL = 0);
 
-Property Format As %String(VALUELIST = ",Excel,PDF");
+Property Format As %String(VALUELIST = ",Excel,PDF,CSV");
 
 Property Emails As %String(MAXLEN = "");
 
diff --git a/PivotSubscriptions/Installer.cls b/PivotSubscriptions/Installer.cls
index a51c8b0..b9ed7f4 100644
--- a/PivotSubscriptions/Installer.cls
+++ b/PivotSubscriptions/Installer.cls
@@ -4,10 +4,13 @@ Class PivotSubscriptions.Installer
 XData LocalInstall [ XMLNamespace = INSTALLER ]
 {
 <Manifest>
+	<Role
+		Name="PivotSubscriptionsUnsubscribe"
+	/>
+	<Resource
+		Name="PivotSubscriptionsManager"
+	/>
 	<Namespace Name="${NAMESPACE}" Create="no" Ensemble="0">
-		<Role
-			Name="PivotSubscriptionsUnsubscribe"
-		/>
 		<!--CSPApplication
 			Url="/api/pivotsubscriptionsunsubscribe"
 			Directory="${CSPDIR}" 
diff --git a/PivotSubscriptions/Subscription.cls b/PivotSubscriptions/Subscription.cls
index 3f83e86..3741d8c 100644
--- a/PivotSubscriptions/Subscription.cls
+++ b/PivotSubscriptions/Subscription.cls
@@ -13,7 +13,7 @@ Property Hour As %Integer(MAXVAL = 23, MINVAL = 0) [ Required ];
 
 Property Minute As %Integer(VALUELIST = ",0,15,30,45") [ Required ];
 
-Property Format As %String(VALUELIST = ",Excel,PDF");
+Property Format As %String(VALUELIST = ",Excel,PDF,CSV");
 
 Property Emails As %String(MAXLEN = "") [ Required ];
 
@@ -67,6 +67,19 @@ Method Unsubscribe(pEmail) As %Status
     Quit tSC
 }
 
+ClassMethod GetScheduleDisplay(pID = "") As %String [ SqlProc ]
+{
+	Set tDisplay=""
+	Quit:pID="" tDisplay
+	
+	Set tSubscription=##class(PivotSubscriptions.Subscription).%OpenId(pID)
+    Quit:'$ISOBJECT(tSubscription) tDisplay
+
+    Set tDisplay=##class(PivotSubscriptions.EventLog).DayOfWeekDisplay(tSubscription.DayOfWeek)_"@"_tSubscription.Hour_":"_$REPLACE($JUSTIFY(tSubscription.Minute,2)," ",0)
+
+	Quit tDisplay
+}
+
 Storage Default
 {
 <Data name="CustomFilters">
diff --git a/PivotSubscriptions/Task.cls b/PivotSubscriptions/Task.cls
index 61ac584..00d6a8e 100644
--- a/PivotSubscriptions/Task.cls
+++ b/PivotSubscriptions/Task.cls
@@ -88,15 +88,19 @@ ClassMethod SendEmail(pID, pSendNow As %Boolean = 0, pPivot As %String, pEmails
 			Set tSC=##class(PivotSubscriptions.Utils).ExecuteForSubscription(mdx,tCustomFilter,.tHasResults)
 			If $$$ISERR(tSC) Quit
 			
+			Set tFormat="Excel"
 			If tHasResults {
 				// Only generate file if requested pivot has results
-				Set tSC=##class(PivotSubscriptions.Utils).GenerateFileForSubscription("Excel",mdx,tCustomFilter,pName,pPivot,.tFilename)
+				If pFormat="CSV" {
+					Set tFormat="CSV"
+				}
+				Set tSC=##class(PivotSubscriptions.Utils).GenerateFileForSubscription(tFormat,mdx,tCustomFilter,pName,pPivot,.tFilename)
 				If $$$ISERR(tSC) Quit
 			}
 
 			// Generate email
 			// check whether the table generated is too wide/truncated AND whether the table has data
-			Set tableStatus=##class(PivotSubscriptions.Utils).CheckTable(pName)
+			Set tableStatus=##class(PivotSubscriptions.Utils).CheckTable(pName,tFilename)
 		
 			Set server=##class(%Net.SMTP).%New()
 			Set server.smtpserver=##class(%SYS.Task.Config).GetData("MailServer")
@@ -120,7 +124,7 @@ ClassMethod SendEmail(pID, pSendNow As %Boolean = 0, pPivot As %String, pEmails
 			
 			If tHasResults {
 				// Add attachment
-				Do ##class(PivotSubscriptions.Utils).WriteEmail(tSubscription,msg,tableStatus,tUnsubscribeList)
+				Do ##class(PivotSubscriptions.Utils).WriteEmail(tSubscription,msg,tableStatus,tUnsubscribeList,.tFilename)
 
 				// if table is too large, then just attach Excel instead
 				If ((pFormat = "PDF") && (tableStatus)) {
@@ -135,11 +139,17 @@ ClassMethod SendEmail(pID, pSendNow As %Boolean = 0, pPivot As %String, pEmails
 					}
 				}
 				
-				Set tSC=msg.AttachFile("",tFilename)
+				If $L(tFilename,"\") {
+					Set tSC=msg.AttachFile($P(tFilename,"\",1,*-1),$P(tFilename,"\",*))
+				} Else {
+					Set tSC=msg.AttachFile("",tFilename)
+				}
 				If $$$ISERR(tSC) Quit
 			} Else {
 				Do ##class(PivotSubscriptions.Utils).WriteEmailHeader(msg)
-				Do msg.TextData.WriteLine(##class(PivotSubscriptions.Utils).GetSettings("NoDataMessage","No data for requested pivot."))
+				Set tSC=##class(PivotSubscriptions.Utils).WriteAnalyzerLink(msg,tSubscription.Pivot)
+				If $$$ISERR(tSC) Quit
+				Do msg.TextData.WriteLine("</br></br>"_##class(PivotSubscriptions.Utils).GetSettings("NoDataMessage","No data for requested pivot."))
 				Do ##class(PivotSubscriptions.Utils).WriteUnsubscribe(msg,tUnsubscribeList)
 				Do ##class(PivotSubscriptions.Utils).WriteEmailFooter(msg)
 
diff --git a/PivotSubscriptions/UI/Dialog/EditSubscription.cls b/PivotSubscriptions/UI/Dialog/EditSubscription.cls
index 25aec26..d012c31 100644
--- a/PivotSubscriptions/UI/Dialog/EditSubscription.cls
+++ b/PivotSubscriptions/UI/Dialog/EditSubscription.cls
@@ -11,7 +11,7 @@ Parameter DOMAIN = "PivotSubscriptions";
 
 Property pivotName As %ZEN.Datatype.string(ZENURL = "PIVOTNAME");
 
-Property SubscriptionId As %ZEN.Datatype.integer(ZENURL = "SUBSCRIPTIONID");
+Property SubscriptionId As %ZEN.Datatype.integer(ZENURL = "SUBSCRIPTIONID") [ InitialExpression = 0 ];
 
 Property SelectedEmail As %String;
 
@@ -30,7 +30,15 @@ XData Style
 XData dialogBody [ XMLNamespace = "http://www.intersystems.com/zen" ]
 {
 <pane xmlns="http://www.intersystems.com/zen" title="">
-<label id="PivotTable" label="Subscription source: "/>
+<dataCombo id="PivotTable" label="Subscription source: " title="Select a pivot table for subscription source" name="PivotTable"
+		editable="true" unrestricted="true"	searchKeyLen="10" dropdownWidth="50.0em" size="40"
+		queryClass="PivotSubscriptions.UI.Dialog.EditSubscription" queryName="GetPivots"
+		comboType="timer" disabled="false" hidden="false"		
+		displayColumns="1,2" choiceColumn="2" valueColumn="2" 
+		columnHeaders="Owner,Name"	
+		>
+</dataCombo>
+<!--label id="PivotTable" label="Subscription source: "/-->
 <text id="SubscriptionId" value="0" hidden="true"/>
 <label id="Name" label="Subscription name: "/>
 <text id="SubscriptionName" size="40"/>
@@ -41,7 +49,7 @@ XData dialogBody [ XMLNamespace = "http://www.intersystems.com/zen" ]
 	<select id="Hour" label="Hour" displayList="00,01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20,21,22,23" valueList="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23" value="12"/>
 	<select id="Minute" label="Minute" displayList="00,15,30,45" valueList="0,15,30,45" value="0"/>
 </hgroup>
-<radioSet id="Format" label="Format" displayList="Excel,PDF" valueList="Excel,PDF" value="Excel"/>
+<radioSet id="Format" label="Format" displayList="Excel,PDF,CSV" valueList="Excel,PDF,CSV" value="Excel"/>
 <textarea id="Emails" label="Email Addresses (Comma separated list)" cols="50" rows="2" onchange="zenPage.populateEmailList();"/>
 <spacer height="5px"/>
 <hgroup>
@@ -98,8 +106,11 @@ Method %OnAfterCreatePage() As %Status
 		}
 	}
 
-	Set tTable=..%GetComponentById("PivotTable")
-	Set tTable.label="Subscription source: """_$ZCONVERT(..pivotName,"I","HTML")_""""
+	If ..pivotName'="" {
+		Set tTable=..%GetComponentById("PivotTable")
+		Set tTable.value=$ZCONVERT(..pivotName,"I","HTML")
+		Set tTable.readOnly=1
+	}
 
 	Set tOK=..%GetComponentById("btnOK")
 	Set tOK.caption="Save"
@@ -166,11 +177,15 @@ ClientMethod ondialogFinish(action) As %Boolean [ Language = javascript ]
 			alert($$$Text('Please enter at least 1 email.'));
 			return false;
 		}
-		var pivot=this.pivotName;
+		var pivotName=zen("PivotTable").getValue()
+		if (pivotName=="") {
+			alert($$$Text('Please enter at least 1 email.'));
+			return false;
+		}
 		var emailtext=zen('CustomEmailText').getValue();
 		var runonce=zen('RunOnce').getValue();
 		
-		var status=zenPage.EditSubscription(subscriptionid,pivot,dayofweek,hour,minute,emails,format,name,emailtext,runonce);
+		var status=zenPage.EditSubscription(subscriptionid,pivotName,dayofweek,hour,minute,emails,format,name,emailtext,runonce);
 
 		if (status!=1) {
 			alert("Error during save, see Event Log for more details.");
@@ -398,4 +413,54 @@ Method GetPivotCube(pPivot) As %String [ ZenMethod ]
 	Quit tCube
 }
 
+Query GetPivots(pSearch As %String = "") As %Query(ROWSPEC = "POwner:%String,PName:%String,PSubscription:%String")
+{
+}
+
+ClassMethod GetPivotsExecute(ByRef qHandle As %Binary, pSearch As %String = "") As %Status
+{
+	Set tSC=$$$OK
+	
+	Set tSC=##class(%DeepSee.UserPortal.Utils).%GetFolderItemsForUser(.tItems,,,1,1)
+	
+	If $$$ISERR(tSC) Quit tSC
+	
+	Set tItem=$O(tItems(""))
+	While tItem'="" {
+		If $LG(tItems(tItem),2)="Pivot" {
+			Set tTemp=tItems(tItem)
+			If (pSearch'="") && (($$$UPPER($LG(tTemp,10))'[$$$UPPER(pSearch))&&($$$UPPER($LG(tTemp,1))'[$$$UPPER(pSearch))) {
+				Set tTemp=""
+			}
+			Set:tTemp'="" tPivots($I(tPivots))=tTemp  // Sort by pivot ID
+			//Set:tTemp'="" tPivots($LG(tTemp,1))=tTemp  // Sort by pivot name
+		}
+		Set tItem=$O(tItems(tItem))
+	}
+	
+	Merge ^||PivotSubscriptions.getPivotExecute=tPivots
+    Set qHandle=""
+    Quit $$$OK
+}
+
+ClassMethod GetPivotsFetch(ByRef qHandle As %Binary, ByRef Row As %List, ByRef AtEnd As %Integer = 0) As %Status [ PlaceAfter = GetPivotsExecute ]
+{
+    Set qHandle=$O(^||PivotSubscriptions.getPivotExecute(qHandle))
+    If qHandle="" {
+	    Set AtEnd=1
+	    Quit $$$OK
+    }
+	
+	Set Row=$lb($LG(^||PivotSubscriptions.getPivotExecute(qHandle),10),$LG(^||PivotSubscriptions.getPivotExecute(qHandle),1),"Subscription")
+    Set AtEnd=0
+    
+    Quit $$$OK
+}
+
+ClassMethod GetPivotsClose(ByRef qHandle As %Binary) As %Status [ PlaceAfter = GetPivotsFetch ]
+{
+    Set qHandle=""
+    Quit $$$OK
+}
+
 }
diff --git a/PivotSubscriptions/UI/EventLogViewer.cls b/PivotSubscriptions/UI/EventLogViewer.cls
index 23528c0..4cc5d6b 100644
--- a/PivotSubscriptions/UI/EventLogViewer.cls
+++ b/PivotSubscriptions/UI/EventLogViewer.cls
@@ -32,7 +32,7 @@ XData contentPane [ XMLNamespace = "http://www.intersystems.com/zen" ]
 	<column colName="UserName" filterType="text" filterOp="UP["/>
 	<column colName="Name" filterType="text" filterOp="UP["/>
 	<column colName="Emails" filterType="text" filterOp="UP["/>
-	<column colName="Status" filterType="text" filterOp="UP["/>
+	<column colName="Status" filterType="text" filterOp="UP[" OnDrawCell="FormatStatus"/>
 </tablePane>
 </vgroup>
 </hgroup>
@@ -57,4 +57,10 @@ Method %OnGetPageName() As %String [ Internal ]
 	Quit $$$Text("Event Log Viewer","PivotSubscriptions")
 }
 
+Method FormatStatus(pTable As %ZEN.Component.tablePane, pName As %String, pSeed As %String) As %Status
+{
+	Write $System.Status.GetErrorText(%query(pName))
+	Quit $$$OK
+}
+
 }
diff --git a/PivotSubscriptions/UI/PivotList.cls b/PivotSubscriptions/UI/PivotList.cls
deleted file mode 100644
index 72158aa..0000000
--- a/PivotSubscriptions/UI/PivotList.cls
+++ /dev/null
@@ -1,128 +0,0 @@
-Include %DeepSee
-
-Class PivotSubscriptions.UI.PivotList Extends PivotSubscriptions.UI.Template
-{
-
-/// Displayed name of this page.
-Parameter PAGENAME = "Pivot List";
-
-/// This XML block defines the contents of this pane.
-XData contentPane [ XMLNamespace = "http://www.intersystems.com/zen" ]
-{
-<pane xmlns="http://www.intersystems.com/zen">
-<hgroup valign="top" >
-<spacer width="20" />
-<vgroup valign="top" >
-<spacer height="20" />
-<tableNavigatorBar id="tableNavigator" tablePaneId="tablePane" showPageSize="true" />
-<tablePane id="tablePane" 
-    cellSpacing="2"
-	fixedHeaders="false" 
-	queryClass="PivotSubscriptions.UI.PivotList" 
-	queryName="GetPivots" 
-	useSnapshot="true" 
-	showQuery="false"
-	showZebra="true"
-	showRowNumbers="false"
-	pageSize="100" 
-	maxRows="1000" 
-	OnExecuteResultSet="ExecuteRS"
-	>
-<column id="Owner" header="Owner" colName="POwner" filterType="text"/>
-<column id="Name" header="Name" colName="PName" filterType="text" link="./_DeepSee.UserPortal.Analyzer.zen?PIVOT=#(%query.PName)#"/>
-<column id="Subscription" header="Add Subscription" colName="PSubscription" OnDrawCell="DrawAddSubscriptionLink"/>
-</tablePane>
-</vgroup>
-</hgroup>
-</pane>
-}
-
-/// Get the (localized) title string for the page.
-Method %OnGetTitle() As %String [ Internal ]
-{
-	Quit $$$Text("Pivot List","PivotSubscriptions")
-}
-
-/// Get the (localized) name of the page.
-Method %OnGetPageName() As %String [ Internal ]
-{
-	Quit $$$Text("Pivot List","PivotSubscriptions")
-}
-
-Method ExecuteRS(pRS As %ResultSet, Output pSC As %Status, pInfo As %ZEN.Auxiliary.QueryInfo) As %Boolean
-{
-	Quit pRS.%Execute($G(pInfo.filters("POwner")),$G(pInfo.filters("PName")))
-}
-
-ClientMethod launchAddSubscription(pivotName) [ Language = javascript ]
-{
-	var url=zenLink('PivotSubscriptions.UI.Dialog.EditSubscription.zen')
-	var paramChar="?"
-	if (url.indexOf("?")>-1) {
-		paramChar="&"
-	}
-	url=url+paramChar+'SUBSCRIPTIONID=0&PIVOTNAME='+encodeURIComponent(pivotName);
-	zenPage.launchPopupWindow(url,'Add Subscription','status,scrollbars,resizable,width=700,height=575');
-}
-
-ClassMethod DrawAddSubscriptionLink(pTable As %ZEN.Component.tablePane, pName As %String, pSeed As %String) As %Status [ Internal ]
-{
-	&html<<a href="#" onclick="zenPage.launchAddSubscription('#(%query("PName"))#');return false;">#("Add Subscription")#</a>>
-
-	Quit $$$OK
-}
-
-Query GetPivots(pOwner As %String = "", pName As %String = "") As %Query(ROWSPEC = "POwner:%String,PName:%String,PSubscription:%String")
-{
-}
-
-ClassMethod GetPivotsExecute(ByRef qHandle As %Binary, pOwner As %String = "", pName As %String = "") As %Status
-{
-	Set tSC=$$$OK
-	
-	Set tSC=##class(%DeepSee.UserPortal.Utils).%GetFolderItemsForUser(.tItems,,,1,1)
-	
-	If $$$ISERR(tSC) Quit tSC
-	
-	Set tItem=$O(tItems(""))
-	While tItem'="" {
-		If $LG(tItems(tItem),2)="Pivot" {
-			Set tTemp=tItems(tItem)
-			If (pOwner'="")&&($$$UPPER($LG(tTemp,10))'[$$$UPPER(pOwner)) {
-				Set tTemp=""
-			}
-			If (pName'="")&&($$$UPPER($LG(tTemp,1))'[$$$UPPER(pName)) {
-				Set tTemp=""
-			}
-			Set:tTemp'="" tPivots($I(tPivots))=tTemp  // Sort by pivot ID
-			//Set:tTemp'="" tPivots($LG(tTemp,1))=tTemp  // Sort by pivot name
-		}
-		Set tItem=$O(tItems(tItem))
-	}
-	
-	Merge ^||PivotSubscriptions.getPivotExecute=tPivots
-    Set qHandle=""
-    Quit $$$OK
-}
-
-ClassMethod GetPivotsFetch(ByRef qHandle As %Binary, ByRef Row As %List, ByRef AtEnd As %Integer = 0) As %Status [ PlaceAfter = GetPivotsExecute ]
-{
-    Set qHandle=$O(^||PivotSubscriptions.getPivotExecute(qHandle))
-    If qHandle="" {
-	    Set AtEnd=1
-	    Quit $$$OK
-    }
-	
-	Set Row=$lb($LG(^||PivotSubscriptions.getPivotExecute(qHandle),10),$LG(^||PivotSubscriptions.getPivotExecute(qHandle),1),"Subscription")
-    Set AtEnd=0
-    
-    Quit $$$OK
-}
-
-ClassMethod GetPivotsClose(ByRef qHandle As %Binary) As %Status [ PlaceAfter = GetPivotsFetch ]
-{
-    Set qHandle=""
-    Quit $$$OK
-}
-
-}
diff --git a/PivotSubscriptions/UI/SubscriptionManager.cls b/PivotSubscriptions/UI/SubscriptionManager.cls
index 4ab6402..5cdb1a7 100644
--- a/PivotSubscriptions/UI/SubscriptionManager.cls
+++ b/PivotSubscriptions/UI/SubscriptionManager.cls
@@ -30,7 +30,9 @@ XData contentPane [ XMLNamespace = "http://www.intersystems.com/zen" ]
 <column colName="ID" header="Subscription ID" hidden="true" />
 <column id="Name" colName="Name" header="Name" filterType="text" filterOp="UP[" />
 <column id="Pivot" colName="Pivot" header="Pivot" link="./_DeepSee.UserPortal.Analyzer.zen?PIVOT=#(%query.Pivot)#" filterType="text" filterOp="UP[" />
+<column id="CreatedBy" colName="CreatedBy" header="CreatedBy" filterType="text" filterOp="UP[" />
 <column id="Emails" colName="Emails" header="Emails" filterType="text" filterOp="UP[" />
+<column colExpression="PivotSubscriptions.Subscription_GetScheduleDisplay(ID)" colName="Schedule" header="Schedule" filterType="text" filterOp="UP[" />
 <column onclick="zenPage.editSubscription(#(%query.ID)#,'#(%query.Pivot)#')" linkCaption="Edit" link="#"/>
 <column onclick="return zenPage.deleteSubscription('#(%query.ID)#');" linkCaption="Delete" link="#" />
 <column onclick="return zenPage.sendSubscriptionNow('#(%query.ID)#','#(%query.Pivot)#');" linkCaption="Send Now" link="#" />
@@ -58,6 +60,21 @@ Method %OnGetProductName() As %String [ Internal ]
 	Quit "DeepSee"
 }
 
+/// Decorate the page.
+Method %OnAfterCreatePage() As %Status
+{
+	Set tSC=$$$OK
+
+	Set tIsManager=$System.Security.Check("PivotSubscriptionsManager","USE")
+	If 'tIsManager {
+		Set tCreatedBy=..%GetComponentById("CreatedBy")
+		Set tCreatedBy.filterValue=$USERNAME
+		Set tCreatedBy.filterType=""
+	}
+
+	Quit tSC
+}
+
 /// This client event is fired when a popup page launched from this page fires an action.
 ClientMethod onPopupAction(popupName, action, value) [ Internal, Language = javascript ]
 {
@@ -91,7 +108,7 @@ ClientMethod editSubscription(pId, pPivot) [ Internal, Language = javascript ]
 		MODE:"models",
 	};
 	
-	zenLaunchPopupWindow('PivotSubscriptions.UI.Dialog.EditSubscription.cls?SUBSCRIPTIONID='+pId+'&PIVOTNAME='+pPivot,'PivotSubscriptions','status,resizable=yes,width=700,height=575',parms);
+	zenLaunchPopupWindow('PivotSubscriptions.UI.Dialog.EditSubscription.cls?SUBSCRIPTIONID='+pId+'&PIVOTNAME='+pPivot,'PivotSubscriptions','status,resizable=yes,width=700,height=610',parms);
 }
 
 /// Delete the selected subscription.
@@ -168,11 +185,4 @@ Method GetManagerEmail() As %String [ ZenMethod ]
 	Quit ##class(PivotSubscriptions.Utils).GetSettings("AdminEmail")
 }
 
-/// Query to get subscriptions for Subscription Manager display table.
-Query GetSubscriptionsForDisplay() As %SQLQuery
-{
-	SELECT ID,Name,Pivot,Emails
-	FROM PivotSubscriptions.Subscription
-}
-
 }
diff --git a/PivotSubscriptions/UI/Template.cls b/PivotSubscriptions/UI/Template.cls
index 8be16a5..a879db1 100644
--- a/PivotSubscriptions/UI/Template.cls
+++ b/PivotSubscriptions/UI/Template.cls
@@ -10,8 +10,8 @@ Method OnGetRibbonInfo(Output pDisplay As %Boolean, Output pViewIcons As %List,
 	Set pSearchBox=0
 	Set pRibbonTitle=$$$Text(..#PAGENAME)
 
+	Set pCommands($I(pCommands))=$LB("newSubscription",$$$Text("New Subscription"),$$$Text("Create new subscription"),"zenPage.newSubscription();")
 	Set pCommands($I(pCommands))=$LB("subscriptionManager",$$$Text("Subscription Manager"),$$$Text("Manage Pivot Subscriptions"),"zenPage.navigate('subscriptionManager');")
-	Set pCommands($I(pCommands))=$LB("pivotList",$$$Text("Pivot List"),$$$Text("View All Pivot Tables"),"zenPage.navigate('pivotList');")
 	// Check for additional permissions?
 	Set pCommands($I(pCommands))=$LB("configurationPage",$$$Text("Configuration Page"),$$$Text("Configure Settings"),"zenPage.navigate('configurationPage');")
 	Set pCommands($I(pCommands))=$LB("eventLogViewer",$$$Text("Event Log Viewer"),$$$Text("Event Log Viewer"),"zenPage.navigate('eventLogViewer');")
@@ -39,4 +39,14 @@ ClientMethod navigate(pageName) [ Language = javascript ]
 	}
 }
 
+/// Creates edit popup.
+ClientMethod newSubscription() [ Internal, Language = javascript ]
+{
+	var parms = {
+		MODE:"models",
+	};
+	
+	zenLaunchPopupWindow('PivotSubscriptions.UI.Dialog.EditSubscription.cls','PivotSubscriptions','status,resizable=yes,width=700,height=610',parms);
+}
+
 }
diff --git a/PivotSubscriptions/Utils.cls b/PivotSubscriptions/Utils.cls
index 6d02190..0a009a0 100644
--- a/PivotSubscriptions/Utils.cls
+++ b/PivotSubscriptions/Utils.cls
@@ -3,7 +3,7 @@ Class PivotSubscriptions.Utils
 
 ClassMethod GetVersion() As %String
 {
-	Quit "v1.7.0"
+	Quit "v1.8.0"
 }
 
 /// Utility method for saving and updating global variables
@@ -70,40 +70,68 @@ ClassMethod GenerateLink(ByRef pLink As %String = "") As %Status
 	Quit tSC
 }
 
-ClassMethod CheckTable(pName As %String) As %Status
+ClassMethod CheckTable(pName As %String, pFilename As %String) As %Status
 {
-	Set tFilename=$replace($zstrip(pName,"*PC'W",,"/")_" - "_$zd($h,6),"/","-")_".xls"
-
+	If pFilename="" {
+		Quit 0
+	}
 	// embed pivot table as HTML table to email
 	Set tStream=##class(%Stream.FileCharacter).%New()
-	Set tSC=tStream.LinkToFile(tFilename)
+	Set tSC=tStream.LinkToFile(pFilename)
 	
 	// check that file is valid file
 	If $$$ISERR(tSC) Quit tSC
 	
 	Set tTableStatus=0
 	Set tHeaderCount=0
-	// iterate through stream to check that table has actual data
-	While 'tStream.AtEnd {
-		Set tLine=tStream.ReadLine()
-		
-		If $Find(tLine,"<th") {
-			Set tHeaderCount=tHeaderCount+1
+
+	If $e(pFilename,*-2,*)="csv" {
+		Set tLineCount=0
+		While 'tStream.AtEnd {
+			Set tLine=tStream.ReadLine()
+			Set tLineCount=$I(tLineCount)
+			
+			If tLineCount=4 {
+				Set tHeaderCount=$L(tLine,",")
+			}
 		}
-		
-		If $Find(tLine,"<td") {
+
+		If (tHeaderCount<20) && (tLineCount<50) {
 			Set tTableStatus=1
-			// parameterize headerCount
-			If (tHeaderCount > 20) {
-				Set tTableStatus=0
+		}
+	} Else {
+		// iterate through stream to check that table has actual data
+		While 'tStream.AtEnd {
+			Set tLine=tStream.ReadLine()
+			
+			If $Find(tLine,"<th") {
+				Set tHeaderCount=tHeaderCount+1
+			}
+			
+			If $Find(tLine,"<td") {
+				Set tTableStatus=1
+				// parameterize headerCount
+				If (tHeaderCount > 20) {
+					Set tTableStatus=0
+				}
+				Quit
 			}
-			Quit
 		}
 	}
 	
 	Quit tTableStatus
 }
 
+ClassMethod WriteAnalyzerLink(pMsg As %Net.MailMessage, pPivotName) As %Status
+{
+	Set tSC=##class(PivotSubscriptions.Utils).GenerateLink(.tAnalyzerURL)
+	Quit:$$$ISERR(tSC) tSC
+	Set tAnalyzerURL=tAnalyzerURL_$system.CSP.GetDefaultApp($namespace)_"/_DeepSee.UI.Analyzer.zen?PIVOT="_pPivotName
+	Do pMsg.TextData.WriteLine("<a href='"_tAnalyzerURL_"'>Click Here</a> to view the pivot table in your browser.")
+
+	Quit tSC
+}
+
 /// Write header for any email, including styling
 ClassMethod WriteEmailHeader(pMsg As %Net.MailMessage)
 {
@@ -138,7 +166,7 @@ ClassMethod WriteEmailFooter(pMsg As %Net.MailMessage)
 }
 
 /// Write improved email format for subscription, including embeded pivot table
-ClassMethod WriteEmail(pSubscription As PivotSubscriptions.Subscription, pMsg As %Net.MailMessage, pTableStatus, pUnsubscribeList)
+ClassMethod WriteEmail(pSubscription As PivotSubscriptions.Subscription, pMsg As %Net.MailMessage, pTableStatus, pUnsubscribeList, pFilename)
 {
 	Do ##class(PivotSubscriptions.Utils).WriteEmailHeader(pMsg)
 
@@ -146,53 +174,115 @@ ClassMethod WriteEmail(pSubscription As PivotSubscriptions.Subscription, pMsg As
 	If tName="" {
 		Set tName=$E(pSubscription.Pivot,1,*-6)
 	}
-	Set tFilename=$replace($zstrip(tName,"*PC'W",,"/")_" - "_$zd($h,6),"/","-")_".xls"
 
 	// embed pivot table as HTML table to email
 	Set tStream=##class(%Stream.FileCharacter).%New()
-	Set tSC=tStream.LinkToFile(tFilename)
+	Set tSC=tStream.LinkToFile(pFilename)
+	If $$$ISERR(tSC) Quit tSC
+
+	Set tSC=##class(PivotSubscriptions.Utils).WriteAnalyzerLink(pMsg,pSubscription.Pivot)
 	If $$$ISERR(tSC) Quit tSC
 		
 	// check subscription to see if its table has error status 
 	If pTableStatus {
-		// Include link to view in Analyzer
-		Set tSC=##class(PivotSubscriptions.Utils).GenerateLink(.tAnalyzerURL)
-		If $$$ISERR(tSC) Quit
-		Set tAnalyzerURL=tAnalyzerURL_$system.CSP.GetDefaultApp($namespace)_"/_DeepSee.UI.Analyzer.zen?PIVOT="_pSubscription.Pivot
-		Do pMsg.TextData.WriteLine("<a href='"_tAnalyzerURL_"'>Click Here</a> to view the pivot table in your browser.")
 
 		// Include Subscription's custom email text
 		If pSubscription.CustomEmailText'="" {
 			Do pMsg.TextData.WriteLine(pSubscription.CustomEmailText)
 		}
 
-		// .xls to String stream that is read by line and then written to the email (as HTML) by line	
-		While 'tStream.AtEnd {
-			Set tLine=tStream.ReadLine()
-	
-			// properly center and format table to match the rest of the style of the email
-			If tLine="<table border=""0"">" {
-				Do pMsg.TextData.WriteLine("<table style='width:70%; margin-left:15%; margin-right:15%;'>")
-			} ElseIf tLine="<table border=""1"">" {
-				Do pMsg.TextData.WriteLine("<table border='1' style='width:100%'")
-			} ElseIf (($Find(tLine,"<x"))||($Find(tLine,"</x"))||($Find(tLine,"<body>"))||($Find(tLine,"<html>"))||(tLine="</html>")) {
-				Continue
-			} Else {
-				// If 'Short Date' exists, the time value has been changed to excel format
-				If ($Find(tLine,"'Short Date'")) {
-					Set tTimeStartPos=$Find(tLine,"'Short Date'")+2
-					Set tTimeEndPos=$Find(tLine,"<",tTimeStartPos)-2
-					Set tTime=$E(tLine,tTimeStartPos,tTimeEndPos)
-					Set tTime=tTime+$ZDateH("12/30/1899")
-					// Insert the new date display, using the default DeepSee date display option
-					Set tLine=$E(tLine,1,tTimeStartPos-1)_$ZDate(tTime,6)_$E(tLine,tTimeEndPos+1,*)
+		If $p(pFilename,".",*)="csv" {
+			Do pMsg.TextData.WriteLine("<p>")
+			For i=1:1:3 {
+				// Output header information outside of table
+				Set tLine=tStream.ReadLine()
+				If ($E(tLine,1)="""") && ($E(tLine,*)="""") {
+					// Remove " from strings to make it look nicer
+					Set tLine=$E(tLine,2,*-1)
 				}
 				Do pMsg.TextData.WriteLine(tLine)
+				Do pMsg.TextData.WriteLine("</br>")
+			}
+			Do pMsg.TextData.WriteLine("</p>")
+
+			Do pMsg.TextData.WriteLine("<table border=1>")
+			Set tIsColHeader=1
+			Set tRowHeaders=0
+			Set tLineNumber=0
+			While 'tStream.AtEnd {
+				Set tLine=tStream.ReadLine()
+				Set tLineNumber=$I(tLineNumber)
+				Do pMsg.TextData.WriteLine("<tr>")
+				Set tCompound=0
+				Set tPiece=""
+				If $E(tLine,1)'="," {
+					// Headers will start with "nub" cells
+					Set tIsColHeader=0
+				}
+				For i=1:1:$L(tLine,",") {
+					If tCompound {
+						Set tPiece=tPiece_","_$P(tLine,",",i)
+					} Else {
+						Set tPiece=$P(tLine,",",i)
+					}
+					Set tCompound=0
+					If $E(tPiece,1)="""" {
+						If $E(tPiece,*)'="""" {
+							// Read next piece, data contained ','
+							Set tCompound=1
+							Continue
+						}
+						Set tPiece=$E(tPiece,2,*-1)
+					}
+
+					If (tLineNumber=1) && (tPiece="") {
+						Set tRowHeaders=$I(tRowHeaders)
+					}
+
+					If tIsColHeader || (i<=tRowHeaders) {
+						Do pMsg.TextData.WriteLine("<th style=""background:#E0E0FF;"">")
+					} Else {
+						Do pMsg.TextData.WriteLine("<td>")
+					}
+					Do pMsg.TextData.WriteLine(tPiece)
+					If tIsColHeader || (i<=tRowHeaders) {
+						Do pMsg.TextData.WriteLine("</th>")
+					} Else {
+						Do pMsg.TextData.WriteLine("</td>")
+					}
+				}
+				Do pMsg.TextData.WriteLine("</tr>")
+			}
+			Do pMsg.TextData.WriteLine("</table>")
+		} Else {
+			// .xls to String stream that is read by line and then written to the email (as HTML) by line	
+			While 'tStream.AtEnd {
+				Set tLine=tStream.ReadLine()
+		
+				// properly center and format table to match the rest of the style of the email
+				If tLine="<table border=""0"">" {
+					Do pMsg.TextData.WriteLine("<table style='width:70%; margin-left:15%; margin-right:15%;'>")
+				} ElseIf tLine="<table border=""1"">" {
+					Do pMsg.TextData.WriteLine("<table border='1' style='width:100%'")
+				} ElseIf (($Find(tLine,"<x"))||($Find(tLine,"</x"))||($Find(tLine,"<body>"))||($Find(tLine,"<html>"))||(tLine="</html>")) {
+					Continue
+				} Else {
+					// If 'Short Date' exists, the time value has been changed to excel format
+					If ($Find(tLine,"'Short Date'")) {
+						Set tTimeStartPos=$Find(tLine,"'Short Date'")+2
+						Set tTimeEndPos=$Find(tLine,"<",tTimeStartPos)-2
+						Set tTime=$E(tLine,tTimeStartPos,tTimeEndPos)
+						Set tTime=tTime+$ZDateH("12/30/1899")
+						// Insert the new date display, using the default DeepSee date display option
+						Set tLine=$E(tLine,1,tTimeStartPos-1)_$ZDate(tTime,6)_$E(tLine,tTimeEndPos+1,*)
+					}
+					Do pMsg.TextData.WriteLine(tLine)
+				}
 			}
 		}
 	} Else {
 		// custom error message
-		Do pMsg.TextData.WriteLine("Pivot table is too big to be embedded. Please see attachment.")
+		Do pMsg.TextData.WriteLine("</br></br>Pivot table is too big to be embedded. Please see attachment.")
 	}
 
 	Do ##class(PivotSubscriptions.Utils).WriteUnsubscribe(pMsg,pUnsubscribeList)
@@ -324,6 +414,10 @@ ClassMethod GenerateFileForSubscription(pType = "Excel", pMDX, pCustomFilter, pN
 	If pType="Excel" {
 		Set pFilename=$replace($zstrip(pName,"*PC'W",,"/")_" - "_$zd($h,6),"/","-")_".xls"
 		Set tSC=##class(%DeepSee.Utils).%ExportExcelToFile(pFilename,.pParms)
+	} ElseIf pType="CSV" {
+		Set pFilename=$replace($zstrip(pName,"*PC'W",,"/")_" - "_$zd($h,6),"/","-")_".csv"
+		Set tSC=##class(%DeepSee.Utils).%ExportCSVToFile(pFilename,.pParms,.tFilename)
+		Set pFilename=tFilename
 	} Else {
 		Set pFilename = $EXTRACT(pFilename,1,$LENGTH(pFilename)-3) _ "pdf"
 		Do ##class(%DeepSee.Utils).%ExportPDFToFile(pFilename,.pParms)