diff --git a/src/components/auth-block.js b/src/components/auth-block.js
index 7c28ce7f..6c598213 100644
--- a/src/components/auth-block.js
+++ b/src/components/auth-block.js
@@ -30,10 +30,15 @@ const AuthBlock = ({ current_user, is_logged_in }) => {
   if (is_logged_in) {
     const logoutUrl = '/api/v1/logout';
 
+    let user = {};
+    if (current_user) {
+      user = current_user.user;
+    }
+
     return (
       <div className="header__toolbar">
         <div className="header__toolbar_item">
-          <User avatar={{ isRound: true }} text={{ hide: true }} user={current_user.user} />
+          <User avatar={{ isRound: true }} text={{ hide: true }} user={user} />
           <Dropdown>
             <Link className="menu__item" to={getUrl(URL_NAMES.SETTINGS)}>Profile settings</Link>
             <form action={`${API_HOST}${logoutUrl}`} className="menu__item" method="post">
diff --git a/src/components/bookmarks/bookmark.js b/src/components/bookmarks/bookmark.js
new file mode 100644
index 00000000..f744736a
--- /dev/null
+++ b/src/components/bookmarks/bookmark.js
@@ -0,0 +1,64 @@
+/*
+ This file is a part of libertysoil.org website
+ Copyright (C) 2016  Loki Education (Social Enterprise)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import React, { PropTypes } from 'react';
+
+import NavigationItem from '../navigation-item';
+import Icon from '../icon';
+
+/**
+ * An example of bookmark object
+  {
+    className: 'navigation-item--color_blue',
+    to: '/bookmark-url',
+    title: 'Bookmark Example',
+    icon: { icon: 'public' }
+  }
+**/
+
+export default class Bookmark extends React.Component {
+  static propTypes = {
+    i: PropTypes.number,
+    onSettingsClick: PropTypes.func,
+    title: PropTypes.string
+  };
+
+  static defaultProps = {
+    onSettingsClick: () => {}
+  };
+
+  handleSettingsClick = (e) => {
+    const { i, onSettingsClick } = this.props;
+
+    e.preventDefault();
+    onSettingsClick(i);
+  };
+
+  render() {
+    const { title, ...props } = this.props;
+
+    return (
+      <NavigationItem
+        badge={<Icon icon="settings" onClick={this.handleSettingsClick} />}
+        theme="2.0"
+        {...props}
+      >
+        {title}
+      </NavigationItem>
+    );
+  }
+}
diff --git a/src/components/v2/bookmarks.js b/src/components/bookmarks/bookmarks.js
similarity index 52%
rename from src/components/v2/bookmarks.js
rename to src/components/bookmarks/bookmarks.js
index fe08ef29..f4f2073b 100644
--- a/src/components/v2/bookmarks.js
+++ b/src/components/bookmarks/bookmarks.js
@@ -16,13 +16,13 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 import React, { PropTypes } from 'react';
+import { isNull } from 'lodash';
 
-// v1
+import Bookmark from './bookmark';
 import Navigation from '../navigation';
-import NavigationItem from '../navigation-item';
-import Icon from '../icon';
+import BookmarkSettingsModal from './settings-modal';
 
-class Bookmarks extends React.Component {
+export default class Bookmarks extends React.Component {
   static propTypes = {
     bookmarks: PropTypes.arrayOf(PropTypes.shape({}))
   };
@@ -31,46 +31,54 @@ class Bookmarks extends React.Component {
     super(props);
 
     this.state = {
-      showSettings: false
+      activeSettings: null
     };
   }
 
-  handleSettingsClick = (e) => {
-    const { showSettings } = this.state;
+  handleSettingsClick = (i) => {
+    this.setState({ activeSettings: i });
+  };
 
-    console.log(e);
-    this.setState({ showSettings: !showSettings });
+  handleModalClose = () => {
+    this.setState({ activeSettings: null });
+  };
+
+  renderModal = () => {
+    const i = this.state.activeSettings;
+    if (isNull(i)) {
+      return false;
+    }
+
+    const current = this.props.bookmarks[i];
+    return (
+      <BookmarkSettingsModal
+        {...current}
+        onClose={this.handleModalClose}
+      />
+    );
   };
 
   render() {
     const { bookmarks } = this.props;
 
+    if (!bookmarks) {
+      return <script />;
+    }
+
     return (
-      <Navigation>
-        {bookmarks &&
-          bookmarks.map((item, i) => (
-            <NavigationItem
+      <div>
+        <Navigation>
+          {bookmarks.map((item, i) => (
+            <Bookmark
+              {...item}
+              i={i}
               key={i}
-              to={item.url}
-            >
-              <div className="navigation-item__content">
-                {item.title}
-              </div>
-              <div className="navigation-item__aside">
-                <Icon
-                  icon="settings"
-                  onClick={this.handleSettingsClick}
-                />
-              </div>
-              <div className="navigation-item__icon">
-                <Icon
-                  icon={item.icon}
-                />
-              </div>
-            </NavigationItem>
-          ))
-        }
-      </Navigation>
+              onSettingsClick={this.handleSettingsClick}
+            />
+          ))}
+        </Navigation>
+        {this.renderModal()}
+      </div>
     );
   }
 }
diff --git a/src/components/bookmarks/index.js b/src/components/bookmarks/index.js
new file mode 100644
index 00000000..859b5c82
--- /dev/null
+++ b/src/components/bookmarks/index.js
@@ -0,0 +1,22 @@
+/*
+ This file is a part of libertysoil.org website
+ Copyright (C) 2016  Loki Education (Social Enterprise)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import Bookmarks from './bookmarks';
+import Bookmark from './bookmark';
+
+export { Bookmark };
+export default Bookmarks;
diff --git a/src/components/bookmarks/settings-form.js b/src/components/bookmarks/settings-form.js
new file mode 100644
index 00000000..4f7f121d
--- /dev/null
+++ b/src/components/bookmarks/settings-form.js
@@ -0,0 +1,84 @@
+/*
+ This file is a part of libertysoil.org website
+ Copyright (C) 2016  Loki Education (Social Enterprise)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import React, { PropTypes } from 'react';
+import { form as inform, from } from 'react-inform';
+
+import Message from '../message';
+
+class BookmarkSettingsForm extends React.Component {
+  static propTypes = {
+    fields: PropTypes.shape({}),
+    form: PropTypes.shape({}),
+    onSave: PropTypes.func,
+    title: PropTypes.string,
+    to: PropTypes.string
+  };
+
+  static defaultProps = {
+    onSave: () => {}
+  };
+
+  componentDidMount() {
+    const { form, title, to } = this.props;
+
+    form.onValues({ title, to });
+  }
+
+  handleSubmit = (e) => {
+    e.preventDefault();
+
+    const { form, onSave } = this.props;
+
+    form.forceValidate();
+    if (!form.isValid()) {
+      return;
+    }
+
+    const newValues = form.values();
+    onSave(newValues);
+  };
+
+  render() {
+    const { fields } = this.props;
+
+    return (
+      <form onSubmit={this.handleSubmit}>
+        <div className="layout__row">
+          <input {...fields.title} />
+          {fields.title.error &&
+            <Message message={fields.title.error} />
+          }
+        </div>
+        <div className="layout__row">
+          <input {...fields.title} />
+          {fields.to.error &&
+            <Message message={fields.to.error} />
+          }
+        </div>
+      </form>
+    );
+  }
+}
+
+const WrappedBookmarkSettingsForm = inform(from({
+  icon: {},
+  title: {},
+  to: {}
+}))(BookmarkSettingsForm);
+
+export default WrappedBookmarkSettingsForm;
diff --git a/src/components/bookmarks/settings-modal.js b/src/components/bookmarks/settings-modal.js
new file mode 100644
index 00000000..d8df89fc
--- /dev/null
+++ b/src/components/bookmarks/settings-modal.js
@@ -0,0 +1,48 @@
+/*
+ This file is a part of libertysoil.org website
+ Copyright (C) 2016  Loki Education (Social Enterprise)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import React, { PropTypes } from 'react';
+
+import BookmarkSettingsForm from './settings-form';
+import Modal from '../modal-component';
+
+const BookmarkSettingsModal = ({ onClose, onSave, ...props }) => {
+  return (
+    <Modal {...props} onClose={onClose}>
+      <Modal.Head>
+        Bookmark settings
+      </Modal.Head>
+      <Modal.Body>
+        <BookmarkSettingsForm
+          onSave={onSave}
+        />
+      </Modal.Body>
+    </Modal>
+  );
+};
+
+BookmarkSettingsModal.propTypes = {
+  onClose: PropTypes.func,
+  onSave: PropTypes.func
+};
+
+BookmarkSettingsModal.defaultProps = {
+  onClose: () => {},
+  onSave: () => {}
+};
+
+export default BookmarkSettingsModal;
diff --git a/src/components/navigation-item.js b/src/components/navigation-item.js
index 0f25324c..b9895731 100644
--- a/src/components/navigation-item.js
+++ b/src/components/navigation-item.js
@@ -18,7 +18,7 @@
 import React, { PropTypes } from 'react';
 import classNames from 'classnames';
 import { Link } from 'react-router';
-import { omit } from 'lodash';
+import { assign, omit } from 'lodash';
 
 import Icon from './icon';
 
@@ -52,21 +52,26 @@ const NavigationItemPlain = ({
   if (theme === '2.0') {
     const { icon, badge, ...htmlProps } = props;
 
+    const finalIcon = assign({}, icon, {
+      className: classNames('navigation-item__icon', {
+        [icon && icon.className]: icon && icon.className
+      })
+    });
+
     return (
       <div className={cn} {...htmlProps}>
-        <div className="navigation-item__content">
-          {children}
-        </div>
-        {badge &&
-          <div className="navigation-item__badge">
-            {badge}
+        <div className="navigation-item__content-box">
+          <div className="navigation-item__content">
+            {children}
           </div>
-        }
+          {badge &&
+            <div className="navigation-item__badge">
+              {badge}
+            </div>
+          }
+        </div>
         {icon &&
-          <Icon
-            className="navigation-item__icon"
-            icon={icon}
-          />
+          <Icon {...finalIcon} />
         }
       </div>
     );
@@ -100,21 +105,26 @@ const NavigationItemAsLink = ({
   if (theme === '2.0') {
     const { icon, badge, ...htmlProps } = props;
 
+    const finalIcon = assign({}, icon, {
+      className: classNames('navigation-item__icon', {
+        [icon && icon.className]: icon && icon.className
+      })
+    });
+
     return (
       <Link activeClassName={activeCn} className={cn} to={to} {...htmlProps}>
-        <div className="navigation-item__content">
-          {children}
-        </div>
-        {badge &&
-          <div className="navigation-item__badge">
-            {badge}
+        <div className="navigation-item__content-box">
+          <div className="navigation-item__content">
+            {children}
           </div>
-        }
+          {badge &&
+            <div className="navigation-item__badge">
+              {badge}
+            </div>
+          }
+        </div>
         {icon &&
-          <Icon
-            className="navigation-item__icon"
-            icon={icon}
-          />
+          <Icon {...finalIcon} />
         }
       </Link>
     );
diff --git a/src/components/post/footer.js b/src/components/post/footer.js
index 731ac574..25ed8a2f 100644
--- a/src/components/post/footer.js
+++ b/src/components/post/footer.js
@@ -21,7 +21,7 @@ import { isEmpty } from 'lodash';
 import Time from '../time';
 
 import EditPostButton from './edit-post-button';
-import TagLine from './tagline';
+import TagCloud from '../tag-cloud';
 import Toolbar from './toolbar';
 import User from '../user';
 import { URL_NAMES, getUrl } from '../../utils/urlGenerator';
@@ -72,10 +72,16 @@ class PostFooter extends React.Component {
           </div>
         </div>
 
-
         {hasTags &&
           <footer className="card__footer">
-            <TagLine geotags={post.geotags} hashtags={post.hashtags} schools={post.schools} />
+            <TagCloud
+              isLink
+              tags={{
+                geotags: post.geotags,
+                hashtags: post.hashtags,
+                schools: post.schools
+              }}
+            />
           </footer>
         }
 
diff --git a/src/components/post/tagline.js b/src/components/post/tagline.js
deleted file mode 100644
index b3025a3a..00000000
--- a/src/components/post/tagline.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- This file is a part of libertysoil.org website
- Copyright (C) 2016  Loki Education (Social Enterprise)
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-import React from 'react';
-
-import Tag from '../tag';
-import { TAG_HASHTAG, TAG_SCHOOL, TAG_LOCATION } from '../../consts/tags';
-
-const TagLine = ({ geotags, hashtags, schools }) => {
-  if ((geotags && hashtags && schools) && (!geotags.length && !hashtags.length && !schools.length)) {
-    return null;
-  }
-
-  let geotagBlocks;
-  if (geotags) {
-    geotagBlocks = geotags.map(school => {
-      return (
-        <Tag key={school.id} name={school.name} type={TAG_LOCATION} urlId={school.url_name} />
-      );
-    });
-  }
-
-  let schoolBlocks;
-  if (schools) {
-    schoolBlocks = schools.map(school => {
-      return (
-        <Tag key={school.id} name={school.name} type={TAG_SCHOOL} urlId={school.url_name} />
-      );
-    });
-  }
-
-  let hashtagBlocks;
-  if (hashtags) {
-    hashtagBlocks = hashtags.map(tag => {
-      return (
-        <Tag key={tag.id} name={tag.name} type={TAG_HASHTAG} urlId={tag.name} />
-      );
-    });
-  }
-
-  return (
-    <div className="tags">
-      {geotagBlocks}
-      {schoolBlocks}
-      {hashtagBlocks}
-    </div>
-  );
-};
-
-TagLine.displayName = 'TagLine';
-
-TagLine.propTypes = {
-  geotags: React.PropTypes.arrayOf(React.PropTypes.shape({
-    id: React.PropTypes.string,
-    name: React.PropTypes.string
-  })),
-  hashtags: React.PropTypes.arrayOf(React.PropTypes.shape({
-    id: React.PropTypes.string,
-    name: React.PropTypes.string
-  })),
-  schools: React.PropTypes.arrayOf(React.PropTypes.shape({
-    id: React.PropTypes.string,
-    name: React.PropTypes.string,
-    url_name: React.PropTypes.string
-  }))
-};
-
-export default TagLine;
diff --git a/src/components/sidebar-menu/extended.js b/src/components/sidebar-menu/extended.js
new file mode 100644
index 00000000..5fe4dc2d
--- /dev/null
+++ b/src/components/sidebar-menu/extended.js
@@ -0,0 +1,134 @@
+/*
+ This file is a part of libertysoil.org website
+ Copyright (C) 2016  Loki Education (Social Enterprise)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import React from 'react';
+
+import { CurrentUser as CurrentUserPropType } from '../../prop-types/users';
+import { MENU_ITEMS } from '../../consts/sidebar-menu';
+
+import Navigation from '../navigation';
+import NavigationItem from '../navigation-item';
+
+export default class SidebarMenuExtended extends React.Component {
+  static propTypes = {
+    current_user: CurrentUserPropType
+  };
+
+  renderNews = () => {
+    const { current_user: { user = {} } } = this.props;
+    const { username } = user;
+    const { news: menuItem } = MENU_ITEMS;
+
+    const unreadPosts = 4;
+
+    let menuItemContent = menuItem.title.normal;
+    if (unreadPosts) {
+      menuItemContent += `: ${unreadPosts} new posts`;
+    }
+
+    return (
+      <NavigationItem
+        badge={unreadPosts}
+        icon={menuItem.icon}
+        theme="2.0"
+        to={menuItem.url(username)}
+      >
+        {menuItemContent}
+      </NavigationItem>
+    );
+  };
+
+  renderLikes = () => {
+    const { current_user: { likes, user = {} } } = this.props;
+    const { username } = user;
+    const { likes: menuItem } = MENU_ITEMS;
+
+    let menuItemContent = menuItem.title.normal;
+    if (likes.length) {
+      menuItemContent += `: ${likes.length} total`;
+    }
+
+    menuItemContent += `, ${undefined} last week`;
+
+    return (
+      <NavigationItem
+        icon={menuItem.icon}
+        theme="2.0"
+        to={menuItem.url(username)}
+      >
+        {menuItemContent}
+      </NavigationItem>
+    );
+  };
+
+  renderFavorites = () => {
+    const { current_user: { favourites, user = {} } } = this.props;
+    const { username } = user;
+    const { favorites: menuItem } = MENU_ITEMS;
+
+    let menuItemContent = menuItem.title.normal;
+    if (favourites.length) {
+      menuItemContent += `: ${favourites.length} posts`;
+    }
+
+    menuItemContent += `, ${undefined} categories`;
+
+    return (
+      <NavigationItem
+        icon={menuItem.icon}
+        theme="2.0"
+        to={menuItem.url(username)}
+      >
+        {menuItemContent}
+      </NavigationItem>
+    );
+  };
+
+  renderCollections = () => {
+    const { current_user: { following_collections, user = {} } } = this.props;
+    const { username } = user;
+    const { collections: menuItem } = MENU_ITEMS;
+
+    let menuItemContent = menuItem.title.normal;
+    if (following_collections && following_collections.length) {
+      menuItemContent += `: ${following_collections.length} posts`;
+    }
+
+    menuItemContent += `, ${undefined} curated`;
+
+    return (
+      <NavigationItem
+        icon={menuItem.icon}
+        theme="2.0"
+        to={menuItem.url(username)}
+      >
+        {menuItemContent}
+      </NavigationItem>
+    );
+  };
+
+  render() {
+    return (
+      <Navigation>
+        {this.renderNews()}
+        {this.renderLikes()}
+        {this.renderFavorites()}
+        {this.renderCollections()}
+      </Navigation>
+    );
+  }
+}
diff --git a/src/components/sidebar-link.js b/src/components/sidebar-menu/index.js
similarity index 57%
rename from src/components/sidebar-link.js
rename to src/components/sidebar-menu/index.js
index 39f70b3e..1d609da3 100644
--- a/src/components/sidebar-link.js
+++ b/src/components/sidebar-menu/index.js
@@ -16,29 +16,27 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 import React, { PropTypes } from 'react';
-import { Link } from 'react-router';
 
-const SidebarLink = ({ activeClassName, children, className, enabled, to }) => {
-  if (enabled) {
-    return <Link activeClassName={activeClassName} className={className} to={to}>{children}</Link>;
+import SidebarMenuTruncated from './truncated';
+import SidebarMenuMin from './min';
+import SidebarMenuNormal from './normal';
+import SidebarMenuExtended from './extended';
+
+const SidebarMenu = ({ theme, ...props }) => {
+  switch (theme) {
+    case 'trunc': return <SidebarMenuTruncated {...props} />;
+    case 'min': return <SidebarMenuMin {...props} />;
+    case 'ext': return <SidebarMenuExtended {...props} />;
+    default: return <SidebarMenuNormal {...props} />;
   }
-
-  let cn = 'disabled';
-  if (className) {
-    cn += ` ${className}`;
-  }
-
-  return <span className={cn}>{children}</span>;
 };
 
-SidebarLink.displayName = 'SidebarLink';
+SidebarMenu.propTypes = {
+  theme: PropTypes.string
+};
 
-SidebarLink.propTypes = {
-  activeClassName: PropTypes.string,
-  children: PropTypes.node,
-  className: PropTypes.string,
-  enabled: PropTypes.bool,
-  to: PropTypes.string
+SidebarMenu.defaultProps = {
+  theme: 'normal'
 };
 
-export default SidebarLink;
+export default SidebarMenu;
diff --git a/src/components/sidebar-menu/min.js b/src/components/sidebar-menu/min.js
new file mode 100644
index 00000000..e9cf78a5
--- /dev/null
+++ b/src/components/sidebar-menu/min.js
@@ -0,0 +1,58 @@
+/*
+ This file is a part of libertysoil.org website
+ Copyright (C) 2016  Loki Education (Social Enterprise)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import React from 'react';
+import { values } from 'lodash';
+
+import { CurrentUser as CurrentUserPropTypes } from '../../prop-types/users';
+import { MENU_ITEMS } from '../../consts/sidebar-menu';
+
+import Navigation from '../navigation';
+import NavigationItem from '../navigation-item';
+
+const menuItemsArray = values(MENU_ITEMS);
+
+const SidebarMenuMin = ({ current_user }) => {
+  const { user = {} } = current_user;
+  const { username } = user;
+
+  return (
+    <Navigation>
+      {menuItemsArray.map((item, i) => (
+        <NavigationItem
+          icon={item.icon}
+          key={i}
+          theme="2.0"
+          to={item.url(username)}
+        >
+          {item.title.min}
+        </NavigationItem>
+        ))
+      }
+    </Navigation>
+  );
+};
+
+SidebarMenuMin.propTypes = {
+  current_user: CurrentUserPropTypes
+};
+
+SidebarMenuMin.defaultProps = {
+  current_user: {}
+};
+
+export default SidebarMenuMin;
diff --git a/src/components/sidebar-menu/normal.js b/src/components/sidebar-menu/normal.js
new file mode 100644
index 00000000..5e01ad40
--- /dev/null
+++ b/src/components/sidebar-menu/normal.js
@@ -0,0 +1,59 @@
+/*
+ This file is a part of libertysoil.org website
+ Copyright (C) 2016  Loki Education (Social Enterprise)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import React from 'react';
+import { values } from 'lodash';
+
+import { CurrentUser as CurrentUserPropTypes } from '../../prop-types/users';
+import { MENU_ITEMS } from '../../consts/sidebar-menu';
+
+import Navigation from '../navigation';
+import NavigationItem from '../navigation-item';
+
+const menuItemsArray = values(MENU_ITEMS);
+
+const SidebarMenuNormal = ({ current_user }) => {
+  const { user = {} } = current_user;
+  const { username } = user;
+
+  return (
+    <Navigation>
+      {menuItemsArray.map((item, i) => (
+        <NavigationItem
+          className={item.className}
+          icon={item.icon}
+          key={i}
+          theme="2.0"
+          to={item.url(username)}
+        >
+          {item.title.normal}
+        </NavigationItem>
+        ))
+      }
+    </Navigation>
+  );
+};
+
+SidebarMenuNormal.propTypes = {
+  current_user: CurrentUserPropTypes
+};
+
+SidebarMenuNormal.defaultProps = {
+  current_user: {}
+};
+
+export default SidebarMenuNormal;
diff --git a/src/components/sidebar-menu/truncated.js b/src/components/sidebar-menu/truncated.js
new file mode 100644
index 00000000..3dc6ac95
--- /dev/null
+++ b/src/components/sidebar-menu/truncated.js
@@ -0,0 +1,57 @@
+/*
+ This file is a part of libertysoil.org website
+ Copyright (C) 2016  Loki Education (Social Enterprise)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import React from 'react';
+import { values } from 'lodash';
+
+import { CurrentUser as CurrentUserPropTypes } from '../../prop-types/users';
+import { MENU_ITEMS } from '../../consts/sidebar-menu';
+
+import Navigation from '../navigation';
+import NavigationItem from '../navigation-item';
+
+const SidebarMenuTruncated = ({ current_user }) => {
+  const { user = {} } = current_user;
+  const { username } = user;
+  const menuItemsArray = values(MENU_ITEMS);
+
+  return (
+    <Navigation>
+      {menuItemsArray.map((item, i) => (
+        <NavigationItem
+          className="navigation-item--truncated"
+          icon={item.icon}
+          key={i}
+          theme="2.0"
+          title={item.title.max}
+          to={item.url(username)}
+        />
+        ))
+      }
+    </Navigation>
+  );
+};
+
+SidebarMenuTruncated.propTypes = {
+  current_user: CurrentUserPropTypes
+};
+
+SidebarMenuTruncated.defaultProps = {
+  current_user: {}
+};
+
+export default SidebarMenuTruncated;
diff --git a/src/components/sidebar.js b/src/components/sidebar.js
index 5adfd942..cbd45bf1 100644
--- a/src/components/sidebar.js
+++ b/src/components/sidebar.js
@@ -16,214 +16,48 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 import React, { PropTypes } from 'react';
-import { values, throttle } from 'lodash';
-import { connect } from 'react-redux';
-import { Link } from 'react-router';
 
-import { Immutable as ImmutablePropType } from '../prop-types/common';
 import { CurrentUser as CurrentUserPropType } from '../prop-types/users';
 
-import { toggleSidebar } from '../actions/ui';
-
-import Navigation from './navigation';
-import NavigationItem from './navigation-item';
-import CurrentUser from './current-user';
-import TagCloud from './tag-cloud';
-import SidebarFollowedTags from './sidebar-followed-tags';
-import currentUserSelector from '../selectors/currentUser';
-import createSelector from '../selectors/createSelector';
-
-class Sidebar extends React.Component {
-  static displayName = 'Sidebar';
+import TagsInform from './tags-inform';
+import Bookmarks from './bookmarks';
+import SidebarMenu from './sidebar-menu';
 
+export default class Sidebar extends React.Component {
   static propTypes = {
-    current_user: ImmutablePropType(CurrentUserPropType),
-    dispatch: PropTypes.func.isRequired,
-    is_logged_in: PropTypes.bool.isRequired
-  };
-
-  static contextTypes = {
-    routeLocation: PropTypes.shape({})
+    current_user: CurrentUserPropType,
+    theme: PropTypes.string
   };
 
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      clientWidth: 0
-    };
-  }
-
-  componentDidMount() {
-    window.addEventListener('resize', this.toggleVisible);
-    document.addEventListener('DOMContentLoaded', this.toggleVisible);
-  }
-
-  componentWillUnmount() {
-    window.removeEventListener('resize', this.toggleVisible);
-    document.removeEventListener('DOMContentLoaded', this.toggleVisible);
-  }
-
-  toggleVisible = throttle(() => {
-    const {
-      dispatch,
-      ui
-    } = this.props;
-    const breakpointWidth = 1330;
+  getClassName = () => {
+    const { theme } = this.props;
+    const finalize = s => `sidebar col col-${s} col-s-${s} col-m-${s} col-l-${s} col-xl-${s}`;
 
-    if (typeof document == 'undefined') {
-      return;
+    switch (theme) {
+      case 'trunc': return finalize(1);
+      case 'min': return finalize(2);
+      case 'ext': return finalize(6);
+      default: return finalize(4);
     }
-
-    const clientWidth = document.body.clientWidth;
-
-    if (clientWidth == this.state.clientWidth) {
-      return;
-    }
-
-    if (ui.get('sidebarIsVisible') && (clientWidth <= breakpointWidth) && (clientWidth < this.state.clientWidth)) {
-      dispatch(toggleSidebar(false));
-    }
-
-    if (!ui.get('sidebarIsVisible') && (clientWidth >= breakpointWidth) && (clientWidth > this.state.clientWidth)) {
-      dispatch(toggleSidebar(true));
-    }
-
-    // If DOMContentLoaded event and small screen width
-    if (this.state.clientWidth == 0 && clientWidth <= breakpointWidth) {
-      dispatch(toggleSidebar(false));
-    }
-
-    this.setState({ clientWidth });
-  }, 100);
+  };
 
   render() {
-    const { routeLocation } = this.context;
-    const {
-      ui,
-      is_logged_in
-    } = this.props;
-    const sidebarClassName = ['sidebar'];
-
-    if (!is_logged_in) {
-      return null;
-    }
-
-    if (ui.get('sidebarIsVisible')) {
-      sidebarClassName.push('sidebar-visible');
-    }
-
-    const current_user = this.props.current_user.toJS();
-
-    const followedTags = values(current_user.followed_hashtags);
-    const followedSchools = values(current_user.followed_schools);
-    const followedGeotags = values(current_user.followed_geotags);
-
-    const showLikes =
-      (current_user.likes && current_user.likes.length)
-      || this.props.current_user.get('liked_hashtags').size
-      || this.props.current_user.get('liked_geotags').size
-      || this.props.current_user.get('liked_schools').size;
-    const showFavorites = (current_user.favourites && current_user.favourites.length > 0);
-    const showFollowedTags = followedTags.length || followedSchools.length || followedGeotags.length;
-    const showUsedTags = current_user.hashtags.length || current_user.geotags.length || current_user.schools.length;
-
-    let followedTagsSection;
-    if (showFollowedTags) {
-      followedTagsSection = (
-        <div className="layout__row layout__row-double">
-          <h4 className="sidebar__heading">I follow</h4>
-          <Navigation>
-            <SidebarFollowedTags geotags={followedGeotags} hashtags={followedTags} schools={followedSchools} />
-          </Navigation>
-        </div>
-      );
-    }
-
-    let likesSection;
-    if (showLikes) {
-      likesSection = (
-        <NavigationItem
-          enabled
-          icon="favorite"
-          to={`/user/${current_user.user.username}/likes`}
-        >
-          My Likes
-        </NavigationItem>
-      );
-    }
-
-    let favouritesSection;
-    if (showFavorites) {
-      favouritesSection = (
-        <NavigationItem
-          enabled
-          icon="star"
-          to={`/user/${current_user.user.username}/favorites`}
-        >
-          My Favorites
-        </NavigationItem>
-      );
-    }
-
-    let usedTagsSection;
-    if (showUsedTags) {
-      usedTagsSection = (
-        <div className="layout__row layout__row-double">
-          <h4 className="sidebar__heading">I post to</h4>
-          <div className="sidebar__user_tags">
-            <TagCloud
-              geotags={current_user.geotags}
-              hashtags={current_user.hashtags}
-              schools={current_user.schools}
-              truncated
-            />
-          </div>
-        </div>
-      );
+    const { theme } = this.props;
+    let currentUser = this.props.current_user;
+    if (!currentUser) {
+      currentUser = {};
     }
 
-    const username = current_user.user.username;
-    const test = RegExp(`user\/${username}\/?$`);
-    let currentUser;
-
-    if (routeLocation && routeLocation.pathname.match(test)) {
-      currentUser = (
-        <NavigationItem className="sidebar__user" enabled to={`/user/${username}`}>
-          <CurrentUser isLink={false} user={current_user.user} />
-        </NavigationItem>
-      );
-    } else {
-      currentUser = (
-        <Link className="navigation__item sidebar__user" to={`/user/${username}`}>
-          <CurrentUser isLink={false} user={current_user.user} />
-        </Link>
-      );
-    }
+    const { user = {} } = currentUser;
 
     return (
-      <div className={sidebarClassName.join(' ')}>
-        <Navigation className="navigation-first">
-          <NavigationItem enabled icon="public" to="/">News Feed</NavigationItem>
-          {currentUser}
-          {likesSection}
-          {favouritesSection}
-        </Navigation>
-
-        {followedTagsSection}
-        {usedTagsSection}
+      <div className={this.getClassName()}>
+        <SidebarMenu current_user={currentUser} theme={theme} />
+        <TagsInform current_user={currentUser} theme={theme} />
+        {user && user.bookmarks &&
+          <Bookmarks bookmarks={user.bookmarks} />
+        }
       </div>
     );
   }
 }
-
-const selector = createSelector(
-  state => state.get('ui'),
-  currentUserSelector,
-  (ui, current_user) => ({
-    ui,
-    ...current_user
-  })
-);
-
-export default connect(selector)(Sidebar);
diff --git a/src/components/tags-inform/extended.js b/src/components/tags-inform/extended.js
new file mode 100644
index 00000000..83ef35ea
--- /dev/null
+++ b/src/components/tags-inform/extended.js
@@ -0,0 +1,62 @@
+/*
+ This file is a part of libertysoil.org website
+ Copyright (C) 2016  Loki Education (Social Enterprise)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import React from 'react';
+import { keys, transform } from 'lodash';
+
+import { TagsToInform as TagsToInformPropType } from './prop-types';
+
+import Navigation from '../navigation';
+import NavigationItem from '../navigation-item';
+import TagCloud from '../tag-cloud';
+
+const TagsInformExtended = ({ tags, ...props }) => {
+  return (
+    <Navigation {...props}>
+      {transform(tags, (acc, tagType, tagTypeTitle) => {
+        if (keys(tagType.list).length) {
+          let unread = tagType.unreadPosts;
+          if (tagType.unreadPosts > 99) {
+            unread = '99+';
+          }
+
+          acc.push(
+            <NavigationItem
+              badge={unread}
+              icon={tagType.icon}
+              key={tagTypeTitle}
+              theme="2.0"
+            >
+              <TagCloud
+                isLink
+                tags={{ [tagTypeTitle]: tagType.list }}
+                theme="min"
+                truncated
+              />
+            </NavigationItem>
+          );
+        }
+      }, [])}
+    </Navigation>
+  );
+};
+
+TagsInformExtended.propTypes = {
+  tags: TagsToInformPropType
+};
+
+export default TagsInformExtended;
diff --git a/src/components/tags-inform/index.js b/src/components/tags-inform/index.js
new file mode 100644
index 00000000..51009a00
--- /dev/null
+++ b/src/components/tags-inform/index.js
@@ -0,0 +1,92 @@
+/*
+ This file is a part of libertysoil.org website
+ Copyright (C) 2016  Loki Education (Social Enterprise)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import React, { PropTypes } from 'react';
+import { omit, values } from 'lodash';
+
+import { CurrentUser as CurrentUserPropType } from '../../prop-types/users';
+
+import TagsInformTrunc from './trunc';
+import TagsInformNormal from './normal';
+import TagsInformExtended from './extended';
+
+/**
+ * Navigation-like block displaying number of unread posts
+ * per each group of tags (geotags, schools, hashtags)
+ */
+export default class TagsInform extends React.Component {
+  static propTypes = {
+    current_user: CurrentUserPropType,
+    theme: PropTypes.string
+  };
+
+  static defaultProps = {
+    theme: 'normal'
+  };
+
+  /**
+   * An example of result:
+    {
+      className: 'navigation-item--color_green',
+      list: values(current_user.followed_geotags) || [],
+      icon: { icon: 'place', className: 'navigation-item__icon--remind_green' },
+      unreadPosts: 44,
+      url: '/geo/'
+    }
+   */
+  getUserPostTags = () => {
+    const { current_user } = this.props;
+
+    return {
+      geotags: {
+        className: 'navigation-item--color_green',
+        list: values(current_user.followed_geotags) || [],
+        icon: { icon: 'place' },
+        url: '/geo/'
+      },
+      hashtags: {
+        className: 'navigation-item--color_blue',
+        list: values(current_user.followed_hashtags) || [],
+        icon: { icon: 'hashtag' },
+        url: '/tag/'
+      },
+      schools: {
+        className: 'navigation-item--color_red',
+        list: values(current_user.followed_schools) || [],
+        icon: { icon: 'school' },
+        url: '/s/'
+      }
+    };
+  }
+
+  render() {
+    const { theme } = this.props;
+    const tags = this.getUserPostTags();
+
+    const childrenProps = {
+      tags,
+      ...omit(this.props, ['current_user', 'theme'])
+    };
+
+    switch (theme) {
+      case 'trunc': return <TagsInformTrunc {...childrenProps} />;
+      case 'ext': return <TagsInformExtended {...childrenProps} />;
+      case 'normal':
+      default: return <TagsInformNormal {...childrenProps} />;
+    }
+  }
+}
diff --git a/src/components/tags-inform/normal.js b/src/components/tags-inform/normal.js
new file mode 100644
index 00000000..ebacdc7e
--- /dev/null
+++ b/src/components/tags-inform/normal.js
@@ -0,0 +1,60 @@
+/*
+ This file is a part of libertysoil.org website
+ Copyright (C) 2016  Loki Education (Social Enterprise)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import React from 'react';
+import { keys, transform } from 'lodash';
+
+import { TagsToInform as TagsToInformPropType } from './prop-types';
+
+import Navigation from '../navigation';
+import NavigationItem from '../navigation-item';
+import TagCloud from '../tag-cloud';
+
+const TagsInformNormal = ({ tags, ...props }) => (
+  <Navigation {...props}>
+    {transform(tags, (acc, tagType, tagTypeTitle) => {
+      if (keys(tagType.list).length) {
+        let unread = tagType.unreadPosts;
+        if (tagType.unreadPosts > 99) {
+          unread = '99+';
+        }
+
+        acc.push(
+          <NavigationItem
+            badge={unread}
+            icon={tagType.icon}
+            key={tagTypeTitle}
+            theme="2.0"
+          >
+            <TagCloud
+              isLink
+              tags={{ [tagTypeTitle]: tagType.list }}
+              theme="min"
+              truncated
+            />
+          </NavigationItem>
+        );
+      }
+    }, [])}
+  </Navigation>
+);
+
+TagsInformNormal.propTypes = {
+  tags: TagsToInformPropType
+};
+
+export default TagsInformNormal;
diff --git a/src/components/tags-inform/prop-types.js b/src/components/tags-inform/prop-types.js
new file mode 100644
index 00000000..9f7d9952
--- /dev/null
+++ b/src/components/tags-inform/prop-types.js
@@ -0,0 +1,46 @@
+/*
+ This file is a part of libertysoil.org website
+ Copyright (C) 2016  Loki Education (Social Enterprise)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import { PropTypes } from 'react';
+
+import { MapOfGeotags as MapOfGeotagsPropType } from '../../prop-types/geotags';
+import { MapOfHashtags as MapOfHashtagsPropType } from '../../prop-types/hashtags';
+import { MapOfSchools as MapOfSchoolsPropType } from '../../prop-types/schools';
+
+const IconPropType = PropTypes.oneOfType([
+  PropTypes.string,
+  PropTypes.shape({
+    className: PropTypes.string,
+    icon: PropTypes.string
+    // take more from IconComponent
+  })
+]);
+
+const getTagTypeToInform = (validate) => (
+  PropTypes.shape({
+    icon: IconPropType,
+    list: validate,
+    unreadPosts: PropTypes.number,
+    url: PropTypes.string
+  })
+);
+
+export const TagsToInform = PropTypes.shape({
+  geotags: getTagTypeToInform(MapOfGeotagsPropType),
+  hashtags: getTagTypeToInform(MapOfHashtagsPropType),
+  schools: getTagTypeToInform(MapOfSchoolsPropType)
+});
diff --git a/src/components/tags-inform/trunc.js b/src/components/tags-inform/trunc.js
new file mode 100644
index 00000000..3a46ba09
--- /dev/null
+++ b/src/components/tags-inform/trunc.js
@@ -0,0 +1,56 @@
+/*
+ This file is a part of libertysoil.org website
+ Copyright (C) 2016  Loki Education (Social Enterprise)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import React from 'react';
+import classNames from 'classnames';
+import { assign, keys, transform } from 'lodash';
+
+import { TagsToInform as TagsToInformPropType } from './prop-types';
+
+import Navigation from '../navigation';
+import NavigationItem from '../navigation-item';
+
+const TagsInformTrunc = ({ tags, ...props }) => (
+  <Navigation {...props}>
+    {transform(tags, (acc, tagType, tagTypeTitle) => {
+      if (keys(tagType.list).length) {
+        const finalIcon = assign({}, tagType.icon, {
+          className: classNames({
+            'navigation-item__icon--remind': tagType.unreadPosts,
+            [tagType.icon.className]: tagType.icon.className
+          })
+        });
+
+        acc.push(
+          <NavigationItem
+            className="navigation-item--truncated"
+            icon={finalIcon}
+            key={tagTypeTitle}
+            theme="2.0"
+            to={tagType.url}
+          />
+        );
+      }
+    }, [])}
+  </Navigation>
+);
+
+TagsInformTrunc.propTypes = {
+  tags: TagsToInformPropType
+};
+
+export default TagsInformTrunc;
diff --git a/src/components/v2/sidebar.js b/src/components/v2/sidebar.js
deleted file mode 100644
index 0fa9876c..00000000
--- a/src/components/v2/sidebar.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- This file is a part of libertysoil.org website
- Copyright (C) 2016  Loki Education (Social Enterprise)
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-import React from 'react';
-
-// v1
-import Navigation from '../navigation';
-import NavigationItem from '../navigation-item';
-
-// v2
-import TagsInformer from './tags-informer';
-import Bookmarks from './bookmarks';
-
-export default class SidebarV2 extends React.Component {
-  render() {
-    const { current_user } = this.props;
-    const { user } = current_user;
-
-    const mainMenuItems = [
-      { title: "News Feed", url: '/', ico: '' },
-      { title: "My Likes", url: `/user/${user.username}/likes`, ico: '' },
-      { title: "My Favorites", url: `/user/${user.username}/favorites`, ico: '' },
-      { title: "Collections", url: '/collections', ico: '' }
-    ];
-
-    const followedTags = {
-      geotags: { list: current_user.followed_geotags },
-      hashtags: { list: current_user.followed_hashtags },
-      schools: { list: current_user.followed_schools }
-    };
-
-    return (
-      <div className="col-l-4 margin-l">
-        <Navigation>
-          {mainMenuItems.map((item, i) => (
-            <NavigationItem
-              enabled
-              key={i}
-              to={item.url}
-            >
-              {item.title}
-            </NavigationItem>
-            ))
-          }
-        </Navigation>
-
-        <TagsInformer tags={followedTags} />
-        {/*<Bookmarks bookmarks={user.bookmarks} />*/}
-      </div>
-    );
-  }
-}
diff --git a/src/consts/sidebar-menu.js b/src/consts/sidebar-menu.js
new file mode 100644
index 00000000..2c38145a
--- /dev/null
+++ b/src/consts/sidebar-menu.js
@@ -0,0 +1,63 @@
+/*
+ This file is a part of libertysoil.org website
+ Copyright (C) 2016  Loki Education (Social Enterprise)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+export const MENU_ITEMS = {
+  news: {
+    className: 'navigation-item--color_blue',
+    title: {
+      min: 'News',
+      normal: 'News Feed'
+    },
+    icon: {
+      icon: 'public'
+    },
+    url: () => '/'
+  },
+  likes: {
+    className: 'navigation-item--color_red',
+    title: {
+      min: 'Likes',
+      normal: 'My Likes'
+    },
+    icon: {
+      icon: 'favorite'
+    },
+    url: (username) => `/user/${username}/likes`
+  },
+  favorites: {
+    className: 'navigation-item--color_green',
+    title: {
+      min: 'Favs',
+      normal: 'My Favorites'
+    },
+    icon: {
+      icon: 'star'
+    },
+    url: (username) => `/user/${username}/favorites`
+  },
+  collections: {
+    className: 'navigation-item--color_blue',
+    title: {
+      min: 'Collect.',
+      normal: 'Collections'
+    },
+    icon: {
+      icon: 'layers'
+    },
+    url: () => '/collections'
+  }
+};
diff --git a/src/less/blocks/navigation.less b/src/less/blocks/navigation.less
index cb9bdce6..2832f1e7 100644
--- a/src/less/blocks/navigation.less
+++ b/src/less/blocks/navigation.less
@@ -16,43 +16,97 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 .navigation-item {
+  @color-green: #7cdb9b;
+  @color-blue: #66b6ec;
+  @color-red: #fc2c5b;
+  @color-lightgrey: #fafafa;
+  
   box-sizing: border-box;
-
   * {
     box-sizing: border-box;
   }
 
-  position: relative;
-  display: flex;
+  margin: 1px 0;
   min-height: 42px;
+  
+  display: flex;
   flex-direction: row;
   flex-wrap: nowrap;
   justify-content: space-between;
   align-items: center;
 
-  &:extend(.font-open_sans);
   font-size: 14px;
   color: #a3a3a3;
   
-  &:hover {
-    color: #000;
-    background-color: #f5f5f5;
+  // elements
+  // content wrapper
+  &__content-box {
+    display: flex;
+    flex-grow: 1;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    align-self: stretch;
+  }
+
+  &__content {
+    align-self: center;
+    padding-left: 20px;
+    width: auto;
+  }
+  
+  &__badge {
+    display: inline-block;
+    width: 20px;
+
+    font-family: Verdana;
+    font-size: 11px;
+
+    .icon {
+      width: 20px;
+      height: 20px;
+    }
   }
 
+  &__icon {
+    padding: 13px;
+    width: 42px;
+    height: 42px;
+    border-radius: 1px;
+    background-color: @color-lightgrey;
+
+    &--remind {
+      position: relative;
+      
+      &::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        width: 3px;
+      }
+    }
+  }
+  
+  // modifiers
   &--active {
+    position: relative;
     font-weight: bold;
     color: #000;
-    background-color: #fafafa;
+
+    .navigation-item__content-box {
+      background-color: #fafafa;
+    }
 
     .navigation-item__icon {
-      background-color: #66b6ec;
       color: #fff;
     }
 
     &::after {
       position: absolute;
       top: calc(50% - 3px);
-      right: -7px;
+      right: -13px;
       
       display: block;
       width: 6px;
@@ -60,26 +114,42 @@
       border-radius: 3px;
 
       content: '';
-      background-color: #66b6ec;
     }
   }
 
-  &__content {
-    flex: auto;
-    width: auto;
+  &--truncated {
+    .navigation-item__content-box {
+      display: none;
+    }
   }
-  
-  &__badge {
-    width: 20px;
-    height: 100%;
+
+  &:hover {
+    color: #000;
+    
+    .navigation-item__content-box {
+      background-color: #f5f5f5;
+    }
   }
 
-  &__icon {
-    padding: 13px;
-    border-radius: 1px;
-    width: 42px;
-    height: 42px;
+  .color-modifier(@name, @color) {
+    &--color_@{name} {
+      .navigation-item__icon::before {
+        background-color: @color;
+      }
 
-    font-size: 16px;
+      &.navigation-item--active {
+        .navigation-item__icon {
+          background-color: @color;
+        }
+
+        &::after {
+          background-color: @color;
+        }
+      }
+    }
   }
+
+  .color-modifier(@name: ~"blue", @color: @color-blue);
+  .color-modifier(@name: ~"green", @color: @color-green);
+  .color-modifier(@name: ~"red", @color: @color-red);
 }
diff --git a/src/less/blocks/page.less b/src/less/blocks/page.less
index 5a65f8e7..740f628f 100644
--- a/src/less/blocks/page.less
+++ b/src/less/blocks/page.less
@@ -113,21 +113,6 @@
   }
 }
 
-.page__sidebar {
-  margin: 0 0 @space 0;
-  width: 100%;
-  box-sizing: border-box;
-
-  @media @after-base {
-    width: 288px - @space;
-    margin: 0 0 @space @space;
-  }
-
-  @media @after-base {
-    width: @sidebarWidth - @space;
-  }
-}
-
 .page__main {
   flex: 1;
   min-height: 512px;
@@ -153,19 +138,11 @@
     background: #fff;
   }
 
-  &-no_sidebar {
-    padding-left: 0!important;
-  }
-
   &-no_spacing {
     padding: 0!important;
   }
 }
 
-.page-with_sidebar .page__container {
-  padding-left: @navigationWidth;
-}
-
 .page__body {
   display: flex;
   flex: 1;
@@ -253,10 +230,3 @@
     }
   }
 }
-
-.page__content_sidebar {
-  width: 160px;
-  flex: 0 0 160px;
-  box-sizing: border-box;
-  border-left: 1px solid #edebe9;
-}
diff --git a/src/less/blocks/sidebar.less b/src/less/blocks/sidebar.less
index 55b4ad49..182ceb37 100644
--- a/src/less/blocks/sidebar.less
+++ b/src/less/blocks/sidebar.less
@@ -16,39 +16,11 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 .sidebar {
-  &:extend(.font-open_sans);
-  padding: @space;
-  width: @navigationWidth;
   box-sizing: border-box;
-  background: #fff;
-  position: fixed;
-  left: 0;
-  bottom: 0;
-  top: @headerHeight;
-  overflow: auto;
-  transform: translateX(-110%);
-  z-index: 100;
-  //transition: transform @transition__time @transition__function;
+  padding-right: 20px;
+  overflow: hidden;
 
-  &__heading {
-    margin-bottom: 15px;
-    font-size: 14px;
-    color: #FF2658;
-  }
-
-  &-visible {
-    transform: translateX(0);
-  }
-
-  @media (max-width: 1330px) {
-    box-shadow: 3px 5px 12px rgba(0, 0, 0, 0.09);
-  }
-}
-
-.sidebar__user {
-  padding: 7px;
-
-  .link {
-    border: none;
+  &.col-2 {
+    padding-right: 0;
   }
 }
diff --git a/src/pages/base/suggestions.js b/src/pages/base/suggestions.js
index 82cdb362..ceb2a111 100644
--- a/src/pages/base/suggestions.js
+++ b/src/pages/base/suggestions.js
@@ -34,7 +34,7 @@ const BaseSuggestionsPage = ({ children, current_user, is_logged_in, messages, t
   <div>
     <Header current_user={current_user} is_logged_in={is_logged_in} />
 
-    <Page className="page__container-no_sidebar">
+    <Page>
       <PageMain>
         <PageBody>
           <PageContent>
diff --git a/src/pages/list.js b/src/pages/list.js
index 3ac7483f..03f663e5 100644
--- a/src/pages/list.js
+++ b/src/pages/list.js
@@ -60,8 +60,6 @@ import {
 } from '../actions/posts';
 import { clearRiver } from '../actions/river';
 
-import Sidebarv2 from '../components/v2/sidebar';
-
 const client = new ApiClient(API_HOST);
 
 export class List extends React.Component {
@@ -209,8 +207,10 @@ export class List extends React.Component {
         </Header>
 
         <Page>
-          <Sidebarv2 current_user={this.props.current_user} />
-          <Sidebar current_user={this.props.current_user} />
+          <Sidebar
+            current_user={this.props.current_user}
+            theme="normal"
+          />
           <PageMain>
             <PageBody>
               <PageContent>
diff --git a/src/pages/new-password.js b/src/pages/new-password.js
index c73a12b5..794905a9 100644
--- a/src/pages/new-password.js
+++ b/src/pages/new-password.js
@@ -164,7 +164,7 @@ class Form extends React.Component {
         <Helmet title="Set New Password for " />
         <Header />
 
-        <Page className="page__container-no_sidebar">
+        <Page>
           <PageMain>
             <PageBody>
               <PageContent>
diff --git a/src/store/ui.js b/src/store/ui.js
index 0e02c43a..73be4bb9 100644
--- a/src/store/ui.js
+++ b/src/store/ui.js
@@ -20,7 +20,7 @@ import i from 'immutable';
 import * as a from '../actions';
 
 const initialState = i.Map({
-  sidebarIsVisible: true,
+  sidebarIsVisible: false,
   progress: i.Map({}),
   comments: i.Map({})
 });