diff --git a/app/store/Services.js b/app/store/Services.js
index f76308b5..33bcec1c 100644
--- a/app/store/Services.js
+++ b/app/store/Services.js
@@ -11,6 +11,7 @@ Ext.define('Rambox.store.Services', {
 	,autoLoad: true
 	,autoSync: true
 
+	,groupField: 'align'
 	,sorters: [
 		{
 			 property: 'position'
diff --git a/app/view/main/Main.js b/app/view/main/Main.js
index 421c6fc0..8b97670a 100644
--- a/app/view/main/Main.js
+++ b/app/view/main/Main.js
@@ -118,6 +118,16 @@ Ext.define('Rambox.view.main.Main', {
 					,margin: '0 0 0 5'
 					,flex: 1
 					,header: { height: 50 }
+					,features: [
+						{
+							 ftype:'grouping'
+							,groupHeaderTpl: '{columnName:uppercase}: {name:capitalize} ({rows.length} Item{[values.rows.length > 1 ? "s" : ""]})'
+						}
+					]
+					,plugins: {
+						 ptype: 'cellediting'
+						,clicksToEdit: 2
+					}
 					,tools: [
 						{
 							 xtype: 'button'
@@ -134,7 +144,16 @@ Ext.define('Rambox.view.main.Main', {
 							,variableRowHeight: true
 							,tpl: '<img src="{[ values.type !== \"custom\" ? \"resources/icons/\"+values.logo : (values.logo == \"\" ? \"resources/icons/custom.png\" : values.logo) ]}" data-qtip="{type:capitalize}" width="32" />'
 						}
-						,{ text: 'Name', dataIndex: 'name', variableRowHeight: true, flex: 1 }
+						,{
+							 text: 'Name'
+							,dataIndex: 'name'
+							,variableRowHeight: true
+							,flex: 1
+							,editor: {
+								 xtype: 'textfield'
+								,allowBlank: true
+							}
+						}
 						,{
 							 xtype: 'actioncolumn'
 							,width: 60
@@ -179,6 +198,10 @@ Ext.define('Rambox.view.main.Main', {
 					,viewConfig: {
 						 emptyText: 'No services added...'
 						,forceFit: true
+						,stripeRows: true
+					}
+					,listeners: {
+						edit: 'onRenameService'
 					}
 				}
 			]
diff --git a/app/view/main/MainController.js b/app/view/main/MainController.js
index 440953fb..49dc3c64 100644
--- a/app/view/main/MainController.js
+++ b/app/view/main/MainController.js
@@ -34,6 +34,15 @@ Ext.define('Rambox.view.main.MainController', {
 		store.resumeEvent('remove');
 	}
 
+	,onRenameService: function(editor, e) {
+		var me = this;
+
+		e.record.commit();
+
+		// Change the title of the Tab
+		Ext.getCmp('tab_'+e.record.get('id')).setTitle(e.record.get('name'));
+	}
+
 	,showSimpleModal: function(record, edit) {
 		var me = this;