diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less
index b1e6f105bf16e..8a7d01859a6ac 100644
--- a/client/stylesheets/base.less
+++ b/client/stylesheets/base.less
@@ -6,7 +6,7 @@
 @import url(http://fonts.googleapis.com/css?family=Muli:400,300,500);
 @footer-min-height: 70px;
 @header-min-height: 60px;
-@rooms-box-width: 220px;
+@rooms-box-width: 260px;
 @primary-background-color: #0b1628;
 @secondary-background-color: #F4F4F4;
 @tertiary-background-color: #E9E9E9;
@@ -993,6 +993,78 @@ a.github-fork {
 			direction: ltr;
 			padding-left: 8px;
 		}
+		.nav-flex {
+			background-color: lighten(@primary-background-color, 15%);
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 1000;
+			// padding-top: 15px;
+			width: @rooms-box-width;
+			// .calc(width, @rooms-box-width ~'  - 10px');
+			.calc(height, ~'100% - ' @footer-min-height);
+			.transition(transform .3s cubic-bezier(.5, 0, .1, 1));
+			&._hidden {
+				.transform(translateX(-100%));
+			}
+			&.private-group-flex {
+				// background-color: #FFFFFF;
+			}
+			.close-nav-flex {
+				background-color: transparent;
+				border: none;
+				float: right;
+				color: #FFFFFF;
+				cursor: pointer;
+				line-height: @header-min-height;
+			}
+			h4 {
+				color: #FFFFFF;
+				text-align: center;
+				line-height: @header-min-height;
+				background-color: lighten(@primary-background-color, 10%);
+			}
+			.wrapper {
+				padding: 1em;
+
+				label {
+					color: #FFFFFF;
+					margin-top: 1em;
+					display: inline-block;
+				}
+
+				.selected-users {
+					min-height: 1em;
+					li {
+						background-color: #FFF;
+						display: inline-block;
+						border-radius: 3px;
+						padding: 4px;
+						margin: 1px 0;
+						i {
+							color: #000000;
+							cursor: pointer;
+						}
+					}
+				}
+
+				.buttons {
+					text-align: center;
+					margin-top: 1em;
+				}
+			}
+		}
+		h3 {
+			&.add-room {
+				&:hover {
+					color: #AAA;
+				}
+				i {
+					float: right;
+					margin-right: 0.5em;
+				}
+			}
+		}
 	}
 	.header {
 		position: absolute;
diff --git a/client/views/app/asideNav/channels.coffee b/client/views/app/asideNav/channels.coffee
new file mode 100644
index 0000000000000..1ddb1b990a735
--- /dev/null
+++ b/client/views/app/asideNav/channels.coffee
@@ -0,0 +1,89 @@
+Template.channels.helpers
+	tRoomMembers: ->
+		return t('chatRooms.Members_placeholder')
+
+	rooms: ->
+		return ChatSubscription.find { uid: Meteor.userId(), t: { $in: ['c']}, f: { $ne: true } }, { sort: 'rn': 1 }
+
+	selectedUsers: ->
+		return Template.instance().selectedUsers.get()
+
+	name: ->
+		return Template.instance().selectedUserNames[this.valueOf()]
+
+	autocompleteSettings: ->
+		return {
+			limit: 10
+			# inputDelay: 300
+			rules: [
+				{
+					# @TODO maybe change this 'collection' and/or template
+					collection: 'UserAndRoom'
+					subscription: 'roomSearch'
+					field: 'name'
+					template: Template.roomSearch
+					noMatchTemplate: Template.roomSearchEmpty
+					matchAll: true
+					filter:
+						type: 'u'
+						$and: [
+							{ _id: { $ne: Meteor.userId() } }
+							{ _id: { $nin: Template.instance().selectedUsers.get() } }
+						]
+					sort: 'name'
+				}
+			]
+		}
+
+Template.channels.events
+	'click .add-room': (e, instance) ->
+		$('.channel-flex').removeClass('_hidden')
+
+		instance.clearForm()
+		$('#channel-name').focus()
+
+	'click .close-nav-flex': ->
+		$('.channel-flex').addClass('_hidden')
+
+	'autocompleteselect #channel-members': (event, instance, doc) ->
+		instance.selectedUsers.set instance.selectedUsers.get().concat doc._id
+
+		instance.selectedUserNames[doc._id] = doc.name
+
+		event.currentTarget.value = ''
+		event.currentTarget.focus()
+
+	'click .remove-room-member': (e, instance) ->
+		self = @
+
+		users = Template.instance().selectedUsers.get()
+		users = _.reject Template.instance().selectedUsers.get(), (_id) ->
+			return _id is self.valueOf()
+
+		Template.instance().selectedUsers.set(users)
+
+		$('#channel-members').focus()
+
+	'click .cancel-channel': (e, instance) ->
+		$('.channel-flex').addClass('_hidden')
+
+	'click .save-channel': (e, instance) ->
+		Meteor.call 'createChannel', instance.find('#channel-name').value, instance.selectedUsers.get(), (err, result) ->
+			if err
+				return toastr.error err.reason
+
+			$('.channel-flex').addClass('_hidden')
+
+			instance.clearForm()
+
+			Router.go 'room', { _id: result.rid }
+
+Template.channels.onCreated ->
+	instance = this
+	instance.selectedUsers = new ReactiveVar []
+	instance.selectedUserNames = {}
+
+	instance.clearForm = ->
+		instance.selectedUsers.set([])
+		instance.find('#channel-name').value = ''
+		instance.find('#channel-members').value = ''
diff --git a/client/views/app/asideNav/channels.html b/client/views/app/asideNav/channels.html
new file mode 100644
index 0000000000000..dc940455d3152
--- /dev/null
+++ b/client/views/app/asideNav/channels.html
@@ -0,0 +1,37 @@
+<template name="channels">
+	<h3 class="add-room">
+		{{_ "chatRooms.Channels"}}
+		<i class="icon-plus-circled"></i>
+	</h3>
+
+	<ul>
+		{{#each rooms}}
+			{{> chatRoomItem }}
+		{{/each}}
+	</ul>
+
+	<div class="nav-flex channel-flex _hidden">
+		<button class="close-nav-flex"><i class="icon-left-open"></i></button>
+		<h4>{{_ "chatRooms.Channels"}}</h4>
+
+		<div class="wrapper">
+			<label for="channel-name">{{_ "chatRooms.Name"}}</label>
+			<input type="text" id="channel-name" placeholder="room-name">
+
+			<label for="channel-members">{{_ "chatRooms.Members" }}</label>
+			{{> inputAutocomplete settings=autocompleteSettings id="channel-members" class="search" placeholder=tRoomMembers autocomplete="off"}}
+
+			<label>{{_ "chatRooms.Selected_users" }}</label>
+			<ul class="selected-users">
+				{{#each selectedUsers}}
+					<li>{{name}} <i class="icon-cancel remove-room-member"></i></li>
+				{{/each}}
+			</ul>
+
+			<div class="buttons">
+				<button class="-btn primary save-channel">{{_ "chatRooms.Save" }}</button>
+				<button class="-btn cancel-channel">{{_ "chatRooms.Cancel" }}</button>
+			</div>
+		</div>
+	</div>
+</template>
diff --git a/client/views/app/asideNav/chatRoomItem.coffee b/client/views/app/asideNav/chatRoomItem.coffee
index c79899370f51f..f327b2ba53b89 100644
--- a/client/views/app/asideNav/chatRoomItem.coffee
+++ b/client/views/app/asideNav/chatRoomItem.coffee
@@ -21,7 +21,8 @@ Template.chatRoomItem.helpers
 	roomIcon: ->
 		switch this.t
 			when 'd' then return 'icon-at'
-			when 'g' then return 'icon-hash'
+			when 'c' then return 'icon-hash'
+			when 'p' then return 'icon-lock'
 
 	active: ->
 		return 'active' if Router.current().params._id? and Router.current().params._id is this.rid
diff --git a/client/views/app/asideNav/chatRoomItem.html b/client/views/app/asideNav/chatRoomItem.html
index 348ef065994bb..75931d6fcc80d 100644
--- a/client/views/app/asideNav/chatRoomItem.html
+++ b/client/views/app/asideNav/chatRoomItem.html
@@ -7,7 +7,7 @@
 			<i class="{{roomIcon}} {{userStatus}}"></i>
 			<span>{{name}}</span>
 			<span class='opt'>
-				<i class="icon-cancel-circled hide-room" title="{{_ "chatRoomItem.Hide_room"}}"></i>
+				{{!-- <i class="icon-cancel-circled hide-room" title="{{_ "chatRoomItem.Hide_room"}}"></i> --}}
 				{{#if canLeave}}
 					<i class="icon-logout leave-room" title="{{_ "chatRoomItem.Leave_room"}}"></i>
 				{{/if}}
diff --git a/client/views/app/asideNav/chatRooms.coffee b/client/views/app/asideNav/chatRooms.coffee
deleted file mode 100644
index 17b1e2ce6688d..0000000000000
--- a/client/views/app/asideNav/chatRooms.coffee
+++ /dev/null
@@ -1,26 +0,0 @@
-Template.chatRooms.helpers
-	roomData: ->
-		return Session.get('roomData' + this.rid)
-
-	recentRooms: ->
-		filter =
-			uid: Meteor.userId()
-			t: { $in: ['d', 'g'] }
-			f: { $not: true }
-			$or: [
-				{ unread: { $gte: 1 } }
-				{ ts: { $gte: moment().subtract(1, 'days').startOf('day').toDate() } }
-			]
-		return ChatSubscription.find filter, { sort: 'rn': 1 }
-
-	favoriteRooms: ->
-		return ChatSubscription.find { uid: Meteor.userId(), t: { $in: ['d', 'g']}, f: true }, { sort: 'rn': 1 }
-
-Template.chatRooms.events
-
-	"click .rooms-box h3": (event)->
-		ul = $(event.currentTarget).next('ul')
-		if ul.is(":visible") then ul.hide() else ul.show()
-
-	"click .rooms-box a": ->
-		$("#rocket-chat").addClass("menu-closed").removeClass("menu-opened")
diff --git a/client/views/app/asideNav/directMessages.coffee b/client/views/app/asideNav/directMessages.coffee
new file mode 100644
index 0000000000000..94cb6bf4bb51c
--- /dev/null
+++ b/client/views/app/asideNav/directMessages.coffee
@@ -0,0 +1,3 @@
+Template.directMessages.helpers
+	rooms: ->
+		return ChatSubscription.find { uid: Meteor.userId(), t: { $in: ['d']}, f: { $ne: true } }, { sort: 'rn': 1 }
diff --git a/client/views/app/asideNav/directMessages.html b/client/views/app/asideNav/directMessages.html
new file mode 100644
index 0000000000000..1f6ce4722ca95
--- /dev/null
+++ b/client/views/app/asideNav/directMessages.html
@@ -0,0 +1,12 @@
+<template name="directMessages">
+	<h3 class="add-room">
+		{{_ "chatRooms.Direct_Messages"}}
+		<i class="icon-plus-circled"></i>
+	</h3>
+
+	<ul>
+		{{#each rooms}}
+			{{> chatRoomItem }}
+		{{/each}}
+	</ul>
+</template>
diff --git a/client/views/app/asideNav/privateGroups.coffee b/client/views/app/asideNav/privateGroups.coffee
new file mode 100644
index 0000000000000..750fb60c8cf87
--- /dev/null
+++ b/client/views/app/asideNav/privateGroups.coffee
@@ -0,0 +1,89 @@
+Template.privateGroups.helpers
+	tRoomMembers: ->
+		return t('chatRooms.Members_placeholder')
+
+	rooms: ->
+		return ChatSubscription.find { uid: Meteor.userId(), t: { $in: ['p']}, f: { $ne: true } }, { sort: 'rn': 1 }
+
+	selectedUsers: ->
+		return Template.instance().selectedUsers.get()
+
+	name: ->
+		return Template.instance().selectedUserNames[this.valueOf()]
+
+	autocompleteSettings: ->
+		return {
+			limit: 10
+			# inputDelay: 300
+			rules: [
+				{
+					# @TODO maybe change this 'collection' and/or template
+					collection: 'UserAndRoom'
+					subscription: 'roomSearch'
+					field: 'name'
+					template: Template.roomSearch
+					noMatchTemplate: Template.roomSearchEmpty
+					matchAll: true
+					filter:
+						type: 'u'
+						$and: [
+							{ _id: { $ne: Meteor.userId() } }
+							{ _id: { $nin: Template.instance().selectedUsers.get() } }
+						]
+					sort: 'name'
+				}
+			]
+		}
+
+Template.privateGroups.events
+	'click .add-room': (e, instance) ->
+		$('.private-group-flex').removeClass('_hidden')
+
+		instance.clearForm()
+		$('#pvt-group-name').focus()
+
+	'click .close-nav-flex': ->
+		$('.private-group-flex').addClass('_hidden')
+
+	'autocompleteselect #pvt-group-members': (event, instance, doc) ->
+		instance.selectedUsers.set instance.selectedUsers.get().concat doc._id
+
+		instance.selectedUserNames[doc._id] = doc.name
+
+		event.currentTarget.value = ''
+		event.currentTarget.focus()
+
+	'click .remove-room-member': (e, instance) ->
+		self = @
+
+		users = Template.instance().selectedUsers.get()
+		users = _.reject Template.instance().selectedUsers.get(), (_id) ->
+			return _id is self.valueOf()
+
+		Template.instance().selectedUsers.set(users)
+
+		$('#pvt-group-members').focus()
+
+	'click .cancel-pvt-group': (e, instance) ->
+		$('.private-group-flex').addClass('_hidden')
+
+	'click .save-pvt-group': (e, instance) ->
+		Meteor.call 'createPrivateGroup', instance.find('#pvt-group-name').value, instance.selectedUsers.get(), (err, result) ->
+			if err
+				return toastr.error err.reason
+
+			$('.private-group-flex').addClass('_hidden')
+
+			instance.clearForm()
+
+			Router.go 'room', { _id: result.rid }
+
+Template.privateGroups.onCreated ->
+	instance = this
+	instance.selectedUsers = new ReactiveVar []
+	instance.selectedUserNames = {}
+
+	instance.clearForm = ->
+		instance.selectedUsers.set([])
+		instance.find('#pvt-group-name').value = ''
+		instance.find('#pvt-group-members').value = ''
diff --git a/client/views/app/asideNav/privateGroups.html b/client/views/app/asideNav/privateGroups.html
new file mode 100644
index 0000000000000..35d20188361e8
--- /dev/null
+++ b/client/views/app/asideNav/privateGroups.html
@@ -0,0 +1,37 @@
+<template name="privateGroups">
+	<h3 class="add-room">
+		{{_ "chatRooms.Private_Groups"}}
+		<i class="icon-plus-circled"></i>
+	</h3>
+
+	<ul>
+		{{#each rooms}}
+			{{> chatRoomItem }}
+		{{/each}}
+	</ul>
+
+	<div class="nav-flex private-group-flex _hidden">
+		<button class="close-nav-flex"><i class="icon-left-open"></i></button>
+		<h4>{{_ "chatRooms.Private_Groups"}}</h4>
+
+		<div class="wrapper">
+			<label for="pvt-group-name">{{_ "chatRooms.Name"}}</label>
+			<input type="text" id="pvt-group-name" placeholder="room-name">
+
+			<label for="pvt-group-members">{{_ "chatRooms.Members" }}</label>
+			{{> inputAutocomplete settings=autocompleteSettings id="pvt-group-members" class="search" placeholder=tRoomMembers autocomplete="off"}}
+
+			<label>Selected users</label>
+			<ul class="selected-users">
+				{{#each selectedUsers}}
+					<li>{{name}} <i class="icon-cancel remove-room-member"></i></li>
+				{{/each}}
+			</ul>
+
+			<div class="buttons">
+				<button class="-btn primary save-pvt-group">{{_ "chatRooms.Save" }}</button>
+				<button class="-btn cancel-pvt-group">{{_ "chatRooms.Cancel" }}</button>
+			</div>
+		</div>
+	</div>
+</template>
diff --git a/client/views/app/asideNav/chatRooms.html b/client/views/app/asideNav/sideNav.html
similarity index 50%
rename from client/views/app/asideNav/chatRooms.html
rename to client/views/app/asideNav/sideNav.html
index e6649da0d3c87..27787ccec2320 100644
--- a/client/views/app/asideNav/chatRooms.html
+++ b/client/views/app/asideNav/sideNav.html
@@ -1,4 +1,4 @@
-<template name="chatRooms">
+<template name="sideNav">
 	<aside class="side-nav" role="navigation">
 		<header class="header">
 			{{> userStatus}}
@@ -6,19 +6,13 @@
 		{{#if currentUser}}
 			<div class="rooms-list">
 				<div class="wrapper">
-					<h3>{{_ "chatRooms.Favorites"}}</h3>
-					<ul>
-						{{#each favoriteRooms}}
-							{{> chatRoomItem }}
-						{{/each}}
-					</ul>
-					<h3>{{_ "chatRooms.Recents"}}</h3>
-					<ul>
-						{{#each recentRooms}}
-							{{> chatRoomItem }}
-						{{/each}}
-						<li><a href="{{ pathFor 'privateHistory' }}"><i class="icon-history"></i> {{_ "general.History"}}</a></li>
-					</ul>
+					{{> starredRooms }}
+
+					{{> channels }}
+
+					{{> directMessages }}
+
+					{{> privateGroups }}
 				</div>
 			</div>
 		{{/if}}
diff --git a/client/views/app/asideNav/starredRooms.coffee b/client/views/app/asideNav/starredRooms.coffee
new file mode 100644
index 0000000000000..a66c643f3e318
--- /dev/null
+++ b/client/views/app/asideNav/starredRooms.coffee
@@ -0,0 +1,3 @@
+Template.starredRooms.helpers
+	rooms: ->
+		return ChatSubscription.find { uid: Meteor.userId(), f: true }, { sort: 'rn': 1 }
diff --git a/client/views/app/asideNav/starredRooms.html b/client/views/app/asideNav/starredRooms.html
new file mode 100644
index 0000000000000..3b5546e0b7651
--- /dev/null
+++ b/client/views/app/asideNav/starredRooms.html
@@ -0,0 +1,9 @@
+<template name="starredRooms">
+	<h3>{{_ "chatRooms.Favorites"}}</h3>
+
+	<ul>
+		{{#each rooms}}
+			{{> chatRoomItem }}
+		{{/each}}
+	</ul>
+</template>
diff --git a/client/views/app/asideNav/userStatus.coffee b/client/views/app/asideNav/userStatus.coffee
index f7062596dc815..28182148b46e9 100644
--- a/client/views/app/asideNav/userStatus.coffee
+++ b/client/views/app/asideNav/userStatus.coffee
@@ -57,11 +57,5 @@ Template.userStatus.events
 		event.preventDefault()
 		Meteor.logout()
 
-	'click .silence-new-rooms': ->
-		for room in Session.get('newRoomSound')
-			KonchatNotification.removeRoomNotification room
-
-		Session.set('newRoomSound', [])
-
 Template.userStatus.rendered = ->
 	AccountBox.init()
diff --git a/client/views/app/asideNav/userStatus.html b/client/views/app/asideNav/userStatus.html
index c11f7998a7db1..336a9866b92a8 100644
--- a/client/views/app/asideNav/userStatus.html
+++ b/client/views/app/asideNav/userStatus.html
@@ -19,7 +19,6 @@ <h4>{{name}}</h4>
 				<a href="" data-status="away" class="status away"><span>{{_ "userStatus.Away"}}</span></a>
 				<a href="" data-status="busy" class="status busy"><span>{{_ "userStatus.Busy"}}</span></a>
 				<a href="" data-status="offline" class="status offline"><span>{{_ "userStatus.Invisible"}}</span></a>
-				<a href="" class="silence-new-rooms"><i class="icon-bell-off"></i><span>{{_ "userStatus.Silence"}}</span></a>
 				<a href=""><i class="icon-sliders"></i><span>{{_ "userStatus.Settings"}}</span><span class="soon">{{_ "userStatus.coming_soon"}}</span></a>
 				<a href=""><i class="icon-lock"></i><span>{{_ "userStatus.Privacy"}}</span><span class="soon">{{_ "userStatus.coming_soon"}}</span></a>
 				<a href="" id="logout"><i class="icon-logout"></i><span>{{_ "userStatus.Logout"}}</span></a>
diff --git a/client/views/app/audioNotification.html b/client/views/app/audioNotification.html
index 8dc786c4b4bb4..9e1d1fb1a2012 100644
--- a/client/views/app/audioNotification.html
+++ b/client/views/app/audioNotification.html
@@ -1,10 +1,10 @@
 <template name="audioNotification">
-	<audio id="chatAudioNotification">
+	<audio id="chatAudioNotification" preload>
 		<source src="/sounds/notify.ogg" type="audio/ogg" />
 		<source src="/sounds/notify.mp3" type="audio/mpeg" />
 		<source src="/sounds/notify.wav" type="audio/wav" />
 	</audio>
-	<audio id="chatNewRoomNotification" preload loop>
+	<audio id="chatNewRoomNotification" preload>
 		<source src="/sounds/door_chime.mp3" type="audio/mpeg" />
 		<source src="/sounds/door_chime.wav" type="audio/wav" />
 	</audio>
diff --git a/client/views/app/chatWindowDashboard.coffee b/client/views/app/chatWindowDashboard.coffee
index 1a4ee63c14977..33e5bae207d1f 100644
--- a/client/views/app/chatWindowDashboard.coffee
+++ b/client/views/app/chatWindowDashboard.coffee
@@ -107,9 +107,9 @@ Template.chatWindowDashboard.helpers
 		console.log 'chatWindowDashboard.roomType' if window.rocketDebug
 		roomData = Session.get('roomData' + this._id)
 		return '' unless roomData
-		return 'icon-hash' if roomData.t is 'g'
+		return 'icon-hash' if roomData.t is 'c'
 		return 'icon-at'   if roomData.t is 'd'
-		return 'icon-at' + roomData.name if roomData.t is 'p'
+		return 'icon-at' + roomData.name if roomData.t is 'p' # @TODO review
 
 	userData: ->
 		console.log 'chatWindowDashboard.userData' if window.rocketDebug
@@ -165,19 +165,26 @@ Template.chatWindowDashboard.helpers
 			]
 		}
 
+	isChannel: ->
+		roomData = Session.get('roomData' + this._id)
+
+		return '' unless roomData
+
+		return roomData.t is 'c'
+
 	canAddUser: ->
 		roomData = Session.get('roomData' + this._id)
 
 		return '' unless roomData
 
-		return roomData.t is 'd' or (roomData.t is 'g' and roomData.uid is Meteor.userId())
+		return roomData.t in ['p', 'c'] and roomData.uid is Meteor.userId()
 
 	canEditName: ->
 		roomData = Session.get('roomData' + this._id)
 
 		return '' unless roomData
 
-		return roomData.uid is Meteor.userId() and roomData.t is 'g'
+		return roomData.uid is Meteor.userId() and roomData.t is 'c'
 
 	roomNameEdit: ->
 		return Session.get('roomData' + this._id)?.name
@@ -204,7 +211,7 @@ Template.chatWindowDashboard.helpers
 
 	isGroupChat: ->
 		room = ChatRoom.findOne(this._id, { reactive: false })
-		return room?.t is 'g'
+		return room?.t is 'c'
 
 	roomUsers: ->
 		room = ChatRoom.findOne(this._id, { reactive: false })
@@ -374,7 +381,7 @@ Template.chatWindowDashboard.events
 
 	'click .user-card-message': (e) ->
 		roomData = Session.get('roomData' + this.rid)
-		if roomData.t == "g"
+		if roomData.t in ['c', 'p']
 			Session.set('flexOpened', true)
 			Session.set('showUserInfo', $(e.currentTarget).data('userid'))
 		else
@@ -405,7 +412,7 @@ Template.chatWindowDashboard.events
 				if result?.rid?
 					Router.go('room', { _id: result.rid })
 					$('#user-add-search').val('')
-		else if roomData.t is 'g'
+		else if roomData.t in ['c', 'p']
 			Meteor.call 'addUserToRoom', { rid: roomData._id, uid: doc.uid }, (error, result) ->
 				if error
 					return Errors.throw error.reason
diff --git a/client/views/app/chatWindowDashboard.html b/client/views/app/chatWindowDashboard.html
index 3563d8c035635..d6a06f90853c9 100644
--- a/client/views/app/chatWindowDashboard.html
+++ b/client/views/app/chatWindowDashboard.html
@@ -94,12 +94,14 @@ <h2>
 					</div>
 				</form>
 			{{else}}
-				<form class="search-form" role="form">
-					<div class="input-line search">
-						{{> inputAutocomplete settings=autocompleteSettingsRoomSearch id="room-search" class="search" placeholder=tQuickSearch autocomplete="off"}}
-						<i class="icon-search"></i>
-					</div>
-				</form>
+				{{#if isChannel}}
+					<form class="search-form" role="form">
+						<div class="input-line search">
+							{{> inputAutocomplete settings=autocompleteSettingsRoomSearch id="room-search" class="search" placeholder=tQuickSearch autocomplete="off"}}
+							<i class="icon-search"></i>
+						</div>
+					</form>
+				{{/if}}
 			{{/if}}
 		</div>
 		<div class="content">
diff --git a/client/views/app/layout.html b/client/views/app/layout.html
index f240d50263016..4d367f557c7cc 100644
--- a/client/views/app/layout.html
+++ b/client/views/app/layout.html
@@ -5,7 +5,7 @@
 		<main class="main-content cf_ {{flexOpened}}">
 			{{> yield}}
 		</main>
-		{{> chatRooms }}
+		{{> sideNav }}
 	</div>
 	{{> audioNotification }}
 </template>
diff --git a/client/views/app/privateHistory.coffee b/client/views/app/privateHistory.coffee
index ab23f4d2321fd..7c1009f28d1eb 100644
--- a/client/views/app/privateHistory.coffee
+++ b/client/views/app/privateHistory.coffee
@@ -1,6 +1,6 @@
 Template.privateHistory.helpers
 	history: ->
-		items = ChatRoom.find { name: { $regex: Session.get('historyFilter'), $options: 'i' }, t: { $in: ['d', 'g'] } }, {'sort': { 'ts': -1 } }
+		items = ChatRoom.find { name: { $regex: Session.get('historyFilter'), $options: 'i' }, t: { $in: ['d', 'c', 'p'] } }, {'sort': { 'ts': -1 } }
 		return {
 			items: items
 			length: items.count()
@@ -9,8 +9,8 @@ Template.privateHistory.helpers
 	type: ->
 		switch this.t
 			when 'd' then 'icon-at'
-			when 'g' then 'icon-hash'
-			when 'v' then 'icon-comment'
+			when 'c' then 'icon-hash'
+			when 'p' then 'icon-lock'
 
 	creation: ->
 		return moment(this.ts).format('LLL')
diff --git a/client/views/app/roomSearch.coffee b/client/views/app/roomSearch.coffee
index 9f09f54c1de43..25a18fe420b33 100644
--- a/client/views/app/roomSearch.coffee
+++ b/client/views/app/roomSearch.coffee
@@ -5,10 +5,9 @@ Template.roomSearch.helpers
 		if this.type is 'r'
 			switch this.t
 				when 'd' then return 'icon-at'
-				when 'g' then return 'icon-hash'
+				when 'c' then return 'icon-hash'
+				when 'p' then return 'icon-lock'
 
 	userStatus: ->
 		if this.type is 'u'
 			return 'status-' + this.status
-		else if this.t is 'v'
-			return 'status-offline'
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index 82c5aaec9b18c..23a94c943a1d7 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -21,7 +21,16 @@
 	"chatRooms": {
 		"Favorites": "Favorites",
 		"Powered_by": "Powered by",
-		"Recents": "Recents"
+		"Recents": "Recents",
+		"Channels": "Channels",
+		"Direct_Messages": "Direct Messages",
+		"Private_Groups": "Private Groups",
+		"Members_placeholder": "Members",
+		"Name": "Name",
+		"Members": "Members",
+		"Selected_users": "Selected members",
+		"Save": "Save",
+		"Cancel": "Cancel"
 	},
 	"chatWindowDashboard": {
 		"Add_users": "Add users",
diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json
index 6da7aa354a438..d725141561101 100644
--- a/i18n/pt.i18n.json
+++ b/i18n/pt.i18n.json
@@ -21,7 +21,16 @@
 	"chatRooms": {
 		"Favorites": "Favoritos",
 		"Powered_by": "Powered by",
-		"Recents": "Recentes"
+		"Recents": "Recentes",
+		"Channels": "Canais",
+		"Direct_Messages": "Mensagens Diretas",
+		"Private_Groups": "Grupos Privados",
+		"Members_placeholder": "Membros",
+		"Name": "Nome",
+		"Members": "Membros",
+		"Selected_users": "Membros selecionados",
+		"Save": "Salvar",
+		"Cancel": "Cancelar"
 	},
 	"chatWindowDashboard": {
 		"Add_users": "Adicionar usuários",
diff --git a/server/lib/accounts.coffee b/server/lib/accounts.coffee
index 901021c030e26..0319d9f0b30e7 100644
--- a/server/lib/accounts.coffee
+++ b/server/lib/accounts.coffee
@@ -56,7 +56,7 @@ Accounts.validateLoginAttempt (login) ->
 				uid: login.user._id
 				ls: (new Date())
 				rn: 'general'
-				t: 'g'
+				t: 'c'
 				f: true
 				ts: new Date()
 				unread: 0
diff --git a/server/methods/addUserToRoom.coffee b/server/methods/addUserToRoom.coffee
index 732a3124bab1b..a2fafd33f216f 100644
--- a/server/methods/addUserToRoom.coffee
+++ b/server/methods/addUserToRoom.coffee
@@ -5,7 +5,7 @@ Meteor.methods
 
 		room = ChatRoom.findOne data.rid
 
-		if room.uid isnt Meteor.userId() and room.t is 'g'
+		if room.uid isnt Meteor.userId() and room.t is 'c'
 			throw new Meteor.Error 403, '[methods] addUserToRoom -> Not allowed'
 
 		# verify if user is already in room
@@ -19,25 +19,25 @@ Meteor.methods
 		newUser = Meteor.users.findOne data.uid
 
 		# if room name wasn't changed, update with new member
-		unless room.nc
-			users = room.uids
-			users.push data.uid
+		# unless room.nc
+		# 	users = room.uids
+		# 	users.push data.uid
 
-			usersName = []
+		# 	usersName = []
 
-			Meteor.users.find({ _id: { $in: users } }, { fields: { name: 1 }, sort: { name: 1 } }).forEach (user) ->
-				usersName.push user.name
+		# 	Meteor.users.find({ _id: { $in: users } }, { fields: { name: 1 }, sort: { name: 1 } }).forEach (user) ->
+		# 		usersName.push user.name
 
-			room.name = usersName.join ', '
+		# 	room.name = usersName.join ', '
 
-			update.$set =
-				name: room.name
+		# 	update.$set =
+		# 		name: room.name
 
-			ChatSubscription.update { rid: data.rid },
-				$set:
-					rn: room.name
-			,
-				multi: true
+		# 	ChatSubscription.update { rid: data.rid },
+		# 		$set:
+		# 			rn: room.name
+		# 	,
+		# 		multi: true
 
 		ChatRoom.update data.rid, update
 
@@ -46,7 +46,7 @@ Meteor.methods
 			rid: data.rid
 			ts: (new Date())
 			rn: room.name
-			t: 'g'
+			t: room.t
 			unread: 0
 
 		ChatMessage.insert
diff --git a/server/methods/createChannel.coffee b/server/methods/createChannel.coffee
new file mode 100644
index 0000000000000..bbda912e440ed
--- /dev/null
+++ b/server/methods/createChannel.coffee
@@ -0,0 +1,37 @@
+Meteor.methods
+	createChannel: (name, members) ->
+		fromId = Meteor.userId()
+		console.log '[methods] createChannel -> '.green, 'fromId:', fromId, 'members:', members
+
+		now = new Date()
+
+		members.push Meteor.userId()
+
+		name = s.slugify name
+
+		# create new room
+		roomId = ChatRoom.insert
+			uids: members
+			ts: now
+			t: 'c'
+			uid: Meteor.userId()
+			name: name
+			msgs: 0
+
+		for user in members
+			sub =
+				uid: user
+				rid: roomId
+				ts: now
+				rn: name
+				t: 'c'
+				unread: 0
+
+			if user is Meteor.userId()
+				sub.ls = now
+
+			ChatSubscription.insert sub
+
+		return {
+			rid: roomId
+		}
diff --git a/server/methods/createGroupRoom.coffee b/server/methods/createGroupRoom.coffee
deleted file mode 100644
index ba111654fa1c4..0000000000000
--- a/server/methods/createGroupRoom.coffee
+++ /dev/null
@@ -1,45 +0,0 @@
-Meteor.methods
-	createGroupRoom: (users, newUser) ->
-		fromId = Meteor.userId()
-		console.log '[methods] createGroupRoom -> '.green, 'fromId:', fromId, 'users:', users, 'newUser:', newUser
-
-		if Meteor.userId() is newUser
-			return
-
-		now = new Date()
-
-		users.push newUser
-
-		usersName = []
-
-		Meteor.users.find({ _id: { $in: users } }, { fields: { name: 1 }, sort: { name: 1 } }).forEach (user) ->
-			usersName.push user.name
-
-		roomName = usersName.join ', '
-
-		# create new room
-		roomId = ChatRoom.insert
-			uids: users
-			ts: now
-			t: 'g'
-			uid: Meteor.userId()
-			name: roomName
-			msgs: 0
-
-		for user in users
-			sub =
-				uid: user
-				rid: roomId
-				ts: now
-				rn: roomName
-				t: 'g'
-				unread: 0
-
-			if user is Meteor.userId()
-				sub.ls = now
-
-			ChatSubscription.insert sub
-
-		return {
-			rid: roomId
-		}
diff --git a/server/methods/createPrivateGroup.coffee b/server/methods/createPrivateGroup.coffee
new file mode 100644
index 0000000000000..f9cee6d61127a
--- /dev/null
+++ b/server/methods/createPrivateGroup.coffee
@@ -0,0 +1,37 @@
+Meteor.methods
+	createPrivateGroup: (name, members) ->
+		fromId = Meteor.userId()
+		console.log '[methods] createPrivateGroup -> '.green, 'fromId:', fromId, 'members:', members
+
+		now = new Date()
+
+		members.push Meteor.userId()
+
+		name = s.slugify name
+
+		# create new room
+		roomId = ChatRoom.insert
+			uids: members
+			ts: now
+			t: 'p'
+			uid: Meteor.userId()
+			name: name
+			msgs: 0
+
+		for user in members
+			sub =
+				uid: user
+				rid: roomId
+				ts: now
+				rn: name
+				t: 'p'
+				unread: 0
+
+			if user is Meteor.userId()
+				sub.ls = now
+
+			ChatSubscription.insert sub
+
+		return {
+			rid: roomId
+		}
diff --git a/server/methods/removeUserFromRoom.coffee b/server/methods/removeUserFromRoom.coffee
index 0b4e34dbc78dd..9520d54826adb 100644
--- a/server/methods/removeUserFromRoom.coffee
+++ b/server/methods/removeUserFromRoom.coffee
@@ -5,7 +5,7 @@ Meteor.methods
 
 		room = ChatRoom.findOne data.rid
 
-		if room.uid isnt Meteor.userId() and room.t is 'g'
+		if room.uid isnt Meteor.userId() and room.t is 'c'
 			throw new Meteor.Error 403, 'Not allowed'
 
 		update =
@@ -15,24 +15,24 @@ Meteor.methods
 		removedUser = Meteor.users.findOne data.uid
 
 		# if room name wasn't changed, update with new member
-		unless room.nc
-			users = _.without room.uids, data.uid
+		# unless room.nc
+		# 	users = _.without room.uids, data.uid
 
-			usersName = []
+		# 	usersName = []
 
-			Meteor.users.find({ _id: { $in: users } }, { fields: { name: 1 }, sort: { name: 1 } }).forEach (user) ->
-				usersName.push user.name
+		# 	Meteor.users.find({ _id: { $in: users } }, { fields: { name: 1 }, sort: { name: 1 } }).forEach (user) ->
+		# 		usersName.push user.name
 
-			room.name = usersName.join ', '
+		# 	room.name = usersName.join ', '
 
-			update.$set =
-				name: room.name
+		# 	update.$set =
+		# 		name: room.name
 
-			ChatSubscription.update { rid: data.rid },
-				$set:
-					rn: room.name
-			,
-				multi: true
+		# 	ChatSubscription.update { rid: data.rid },
+		# 		$set:
+		# 			rn: room.name
+		# 	,
+		# 		multi: true
 
 		ChatRoom.update data.rid, update
 
diff --git a/server/methods/saveRoomName.coffee b/server/methods/saveRoomName.coffee
index 4dc7d31460a89..1768e2ad046e2 100644
--- a/server/methods/saveRoomName.coffee
+++ b/server/methods/saveRoomName.coffee
@@ -5,7 +5,7 @@ Meteor.methods
 
 		room = ChatRoom.findOne data.rid
 
-		if room.uid isnt Meteor.userId() and room.t is 'g'
+		if room.uid isnt Meteor.userId() and room.t is 'c'
 			throw new Meteor.Error 403, 'Not allowed'
 
 		if data.name is room.name
diff --git a/server/publications.coffee b/server/publications.coffee
index 4673ebf519123..c30e2cf09da9c 100644
--- a/server/publications.coffee
+++ b/server/publications.coffee
@@ -109,7 +109,7 @@ Meteor.publish 'privateHistoryRooms', ->
 
 	console.log '[publish] privateHistoryRooms'.green
 
-	return ChatRoom.find { uids: this.userId, t: { $in: ['d', 'g'] } }, { fields: { t: 1, name: 1, msgs: 1, ts: 1, lm: 1, cl: 1 } }
+	return ChatRoom.find { uids: this.userId, t: { $in: ['d', 'c'] } }, { fields: { t: 1, name: 1, msgs: 1, ts: 1, lm: 1, cl: 1 } }
 
 Meteor.publish 'roomSearch', (selector, options, collName) ->
 	unless this.userId
@@ -138,7 +138,7 @@ Meteor.publish 'roomSearch', (selector, options, collName) ->
 	subHandleRooms = null
 
 	# @TODO buscar apenas salas de grupo permitidas
-	roomSelector = _.extend { t: { $in: ['g'] }, uids: this.userId }, selector
+	roomSelector = _.extend { t: { $in: ['c'] }, uids: this.userId }, selector
 
 	if not searchType? or searchType is 'r'
 		subHandleRooms = ChatRoom.find(roomSelector, { limit: 10, fields: { t: 1, name: 1 } }).observeChanges
diff --git a/server/startup/generalRoom.coffee b/server/startup/generalRoom.coffee
index 8e925ef85e778..cdd4247005cdf 100644
--- a/server/startup/generalRoom.coffee
+++ b/server/startup/generalRoom.coffee
@@ -5,6 +5,6 @@ Meteor.startup ->
 				_id: '57om6EQCcFami9wuT'
 				uids: []
 				ts: new Date()
-				t: 'g'
+				t: 'c'
 				name: 'general'
 				msgs: 0