diff --git a/app/src/containers/BoardContainer.js b/app/src/components/BoardContainer.js
similarity index 98%
rename from app/src/containers/BoardContainer.js
rename to app/src/components/BoardContainer.js
index 5351369..0e2b62a 100644
--- a/app/src/containers/BoardContainer.js
+++ b/app/src/components/BoardContainer.js
@@ -7,7 +7,7 @@ import { Header } from 'semantic-ui-react';
 import { drizzle } from '../index';
 
 import TopicList from './TopicList';
-import FloatingButton from '../components/FloatingButton';
+import FloatingButton from './FloatingButton';
 
 /* import { showProgressBar, hideProgressBar } from '../redux/actions/userInterfaceActions'; */
 
diff --git a/app/src/components/CoreLayoutContainer.js b/app/src/components/CoreLayoutContainer.js
index 6f2a1d7..a4fbb5f 100644
--- a/app/src/components/CoreLayoutContainer.js
+++ b/app/src/components/CoreLayoutContainer.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import NavBarContainer from '../containers/NavBarContainer';
-import RightSideBarContainer from '../containers/TransactionsMonitorContainer';
+import NavBarContainer from './NavBarContainer';
+import RightSideBarContainer from './TransactionsMonitorContainer';
 // Styles
 import '../assets/fonts/fontawesome-free-5.7.2/all.js'; // TODO: check https://fontawesome.com/how-to-use/on-the-web/setup/using-package-managers
 import '../assets/css/App.css';
diff --git a/app/src/components/HomeContainer.js b/app/src/components/HomeContainer.js
index 40f1f63..0569e75 100644
--- a/app/src/components/HomeContainer.js
+++ b/app/src/components/HomeContainer.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 
-import BoardContainer from '../containers/BoardContainer';
+import BoardContainer from './BoardContainer';
 
 class HomeContainer extends Component {
   render() {
diff --git a/app/src/containers/LoadingContainer.js b/app/src/components/LoadingContainer.js
similarity index 100%
rename from app/src/containers/LoadingContainer.js
rename to app/src/components/LoadingContainer.js
diff --git a/app/src/containers/NavBarContainer.js b/app/src/components/NavBarContainer.js
similarity index 100%
rename from app/src/containers/NavBarContainer.js
rename to app/src/components/NavBarContainer.js
diff --git a/app/src/containers/NewPost.js b/app/src/components/NewPost.js
similarity index 100%
rename from app/src/containers/NewPost.js
rename to app/src/components/NewPost.js
diff --git a/app/src/containers/NewTopicPreview.js b/app/src/components/NewTopicPreview.js
similarity index 100%
rename from app/src/containers/NewTopicPreview.js
rename to app/src/components/NewTopicPreview.js
diff --git a/app/src/containers/PlaceholderContainer.js b/app/src/components/PlaceholderContainer.js
similarity index 91%
rename from app/src/containers/PlaceholderContainer.js
rename to app/src/components/PlaceholderContainer.js
index c3d2586..3bb2cbb 100644
--- a/app/src/containers/PlaceholderContainer.js
+++ b/app/src/components/PlaceholderContainer.js
@@ -130,17 +130,20 @@ class PlaceholderContainer extends Component {
               </Grid.Row>
               <Grid.Row>
                 <Grid.Column floated="right" textAlign="right">
-                  <Button icon size="mini" disabled
-                    style={{
-                      marginRight: '0px'
-                    }}
-                  >
-                    <Icon name="chevron up" />
-                  </Button>
-                  <Label color="teal">Loading...</Label>
-                  <Button icon size="mini" disabled >
-                    <Icon name="chevron down" />
-                  </Button>
+                  {/* TODO
+                    <Button icon size="mini" disabled
+                      style={{
+                        marginRight: '0px'
+                      }}
+                    >
+                      <Icon name="chevron up" />
+                    </Button>
+                    <Label color="teal">Loading...</Label>
+                    <Button icon size="mini" disabled >
+                      <Icon name="chevron down" />
+                    </Button>
+                     */
+                  }
                   <Button icon size="mini" disabled >
                     <Icon name="linkify" />
                   </Button>
diff --git a/app/src/containers/Post.js b/app/src/components/Post.js
similarity index 97%
rename from app/src/containers/Post.js
rename to app/src/components/Post.js
index 9e899be..7583ec6 100644
--- a/app/src/containers/Post.js
+++ b/app/src/components/Post.js
@@ -5,7 +5,7 @@ import { push } from 'connected-react-router';
 import { Link, withRouter } from 'react-router-dom';
 import { connect } from 'react-redux';
 import ContentLoader from 'react-content-loader';
-import { Button, Divider, Grid, Icon, Label } from 'semantic-ui-react';
+import { Button, Divider, Grid, Icon } from 'semantic-ui-react';
 import TimeAgo from 'react-timeago';
 import UserAvatar from 'react-user-avatar';
 import ReactMarkdown from 'react-markdown';
@@ -126,6 +126,7 @@ class Post extends Component {
             </Grid.Row>
             <Grid.Row>
               <Grid.Column floated="right" textAlign="right">
+                {/*  TODO (also in PlaceHolderContainer)
                 <Button
                   icon
                   size="mini"
@@ -139,6 +140,8 @@ class Post extends Component {
                 <Button icon size="mini">
                   <Icon name="chevron down" />
                 </Button>
+                */
+                }
                 <Button
                   icon
                   size="mini"
@@ -163,7 +166,6 @@ class Post extends Component {
 Post.propTypes = {
   getFocus: PropTypes.bool.isRequired,
   userAddress: PropTypes.string.isRequired,
-  orbitDB: PropTypes.object.isRequired,
   avatarUrl: PropTypes.string,
   postIndex: PropTypes.number.isRequired,
   navigateTo: PropTypes.func.isRequired,
@@ -219,7 +221,6 @@ const mapDispatchToProps = dispatch => bindActionCreators({
 function mapStateToProps(state, ownProps) {
   return {
     userAddress: state.user.address,
-    orbitDB: state.orbit,
     postSubject: getPostSubject(state, ownProps),
     postContent: getPostContent(state, ownProps)
   }
diff --git a/app/src/containers/PostList.js b/app/src/components/PostList.js
similarity index 100%
rename from app/src/containers/PostList.js
rename to app/src/components/PostList.js
diff --git a/app/src/containers/ProfileContainer.js b/app/src/components/ProfileContainer.js
similarity index 98%
rename from app/src/containers/ProfileContainer.js
rename to app/src/components/ProfileContainer.js
index cc2bdf5..b501d58 100644
--- a/app/src/containers/ProfileContainer.js
+++ b/app/src/components/ProfileContainer.js
@@ -9,7 +9,7 @@ import { drizzle } from '../index';
 import ProfileInformation from './ProfileInformation';
 import TopicList from './TopicList';
 import PostList from './PostList';
-import LoadingSpinner from '../components/LoadingSpinner';
+import LoadingSpinner from './LoadingSpinner';
 import { setNavBarTitle } from '../redux/actions/userInterfaceActions';
 
 const callsInfo = [
diff --git a/app/src/containers/ProfileInformation.js b/app/src/components/ProfileInformation.js
similarity index 100%
rename from app/src/containers/ProfileInformation.js
rename to app/src/components/ProfileInformation.js
diff --git a/app/src/containers/SignUpContainer.js b/app/src/components/SignUpContainer.js
similarity index 100%
rename from app/src/containers/SignUpContainer.js
rename to app/src/components/SignUpContainer.js
diff --git a/app/src/containers/StartTopicContainer.js b/app/src/components/StartTopicContainer.js
similarity index 100%
rename from app/src/containers/StartTopicContainer.js
rename to app/src/components/StartTopicContainer.js
diff --git a/app/src/containers/Topic.js b/app/src/components/Topic.js
similarity index 97%
rename from app/src/containers/Topic.js
rename to app/src/components/Topic.js
index 0eeee6f..20827d4 100644
--- a/app/src/containers/Topic.js
+++ b/app/src/components/Topic.js
@@ -71,7 +71,6 @@ Topic.propTypes = {
   userAddress: PropTypes.string.isRequired,
   history: PropTypes.object.isRequired,
   topicData: GetTopicResult.isRequired,
-  orbitDB: PropTypes.object.isRequired,
   topicID: PropTypes.number.isRequired
 };
 
@@ -99,7 +98,6 @@ function getTopicSubject(state, props){
 function mapStateToProps(state, ownProps) {
   return {
     userAddress: state.user.address,
-    orbitDB: state.orbit,
     topicSubject: getTopicSubject(state, ownProps)
   }
 }
diff --git a/app/src/containers/TopicContainer.js b/app/src/components/TopicContainer.js
similarity index 99%
rename from app/src/containers/TopicContainer.js
rename to app/src/components/TopicContainer.js
index 5c672d0..1d38f28 100644
--- a/app/src/containers/TopicContainer.js
+++ b/app/src/components/TopicContainer.js
@@ -7,7 +7,7 @@ import { drizzle } from '../index';
 
 import PostList from './PostList';
 import NewPost from './NewPost';
-import FloatingButton from '../components/FloatingButton';
+import FloatingButton from './FloatingButton';
 
 import { setNavBarTitle } from '../redux/actions/userInterfaceActions.js';
 import { determineDBAddress } from '../utils/orbitUtils';
diff --git a/app/src/containers/TopicList.js b/app/src/components/TopicList.js
similarity index 100%
rename from app/src/containers/TopicList.js
rename to app/src/components/TopicList.js
diff --git a/app/src/containers/TransactionsMonitorContainer.js b/app/src/components/TransactionsMonitorContainer.js
similarity index 100%
rename from app/src/containers/TransactionsMonitorContainer.js
rename to app/src/components/TransactionsMonitorContainer.js
diff --git a/app/src/containers/UsernameFormContainer.js b/app/src/components/UsernameFormContainer.js
similarity index 100%
rename from app/src/containers/UsernameFormContainer.js
rename to app/src/components/UsernameFormContainer.js
diff --git a/app/src/config/drizzleOptions.js b/app/src/config/drizzleOptions.js
index 2e6d942..fc7052c 100644
--- a/app/src/config/drizzleOptions.js
+++ b/app/src/config/drizzleOptions.js
@@ -2,12 +2,6 @@ import Forum from '../contracts/Forum.json';
 // Docs: https://truffleframework.com/docs/drizzle/reference/drizzle-options
 
 const drizzleOptions = {
-  web3: {
-    fallback: {
-      type: 'ws',
-      url: 'ws://127.0.0.1:9545'
-    }
-  },
   contracts: [Forum],
   events: {
     Forum: ['UserSignedUp', 'UsernameUpdated', 'TopicCreated', 'PostCreated']
diff --git a/app/src/index.js b/app/src/index.js
index 94b9b91..aa04ac2 100644
--- a/app/src/index.js
+++ b/app/src/index.js
@@ -11,7 +11,7 @@ import * as serviceWorker from './utils/serviceWorker';
 
 import './assets/css/index.css';
 import drizzleOptions from './config/drizzleOptions';
-import LoadingContainer from './containers/LoadingContainer';
+import LoadingContainer from './components/LoadingContainer';
 
 initIPFS();
 
diff --git a/app/src/redux/actions/drizzleUtilsActions.js b/app/src/redux/actions/drizzleUtilsActions.js
new file mode 100644
index 0000000..93aefb5
--- /dev/null
+++ b/app/src/redux/actions/drizzleUtilsActions.js
@@ -0,0 +1,4 @@
+const DRIZZLE_UTILS_SAGA_INITIALIZED = 'DRIZZLE_UTILS_SAGA_INITIALIZED';
+const DRIZZLE_UTILS_SAGA_ERROR = 'DRIZZLE_UTILS_SAGA_ERROR';
+
+export { DRIZZLE_UTILS_SAGA_INITIALIZED, DRIZZLE_UTILS_SAGA_ERROR }
diff --git a/app/src/redux/actions/web3UtilsActions.js b/app/src/redux/actions/web3UtilsActions.js
deleted file mode 100644
index 784533e..0000000
--- a/app/src/redux/actions/web3UtilsActions.js
+++ /dev/null
@@ -1,4 +0,0 @@
-const WEB3_UTILS_SAGA_INITIALIZED = 'WEB3_UTILS_SAGA_INITIALIZED';
-const WEB3_UTILS_SAGA_ERROR = 'WEB3_UTILS_SAGA_ERROR';
-
-export { WEB3_UTILS_SAGA_INITIALIZED, WEB3_UTILS_SAGA_ERROR }
diff --git a/app/src/redux/sagas/drizzleUtilsSaga.js b/app/src/redux/sagas/drizzleUtilsSaga.js
index 1a8e04d..e0a708d 100644
--- a/app/src/redux/sagas/drizzleUtilsSaga.js
+++ b/app/src/redux/sagas/drizzleUtilsSaga.js
@@ -4,7 +4,10 @@ import getWeb3 from "@drizzle-utils/get-web3";
 import Web3 from "web3";
 
 import Forum from '../../contracts/Forum';
-import { WEB3_UTILS_SAGA_INITIALIZED } from '../actions/web3UtilsActions';
+import {
+  DRIZZLE_UTILS_SAGA_ERROR,
+  DRIZZLE_UTILS_SAGA_INITIALIZED
+} from '../actions/drizzleUtilsActions';
 import { DRIZZLE_INITIALIZED } from '../actions/drizzleActions';
 import { fork, take } from 'redux-saga/effects';
 
@@ -21,11 +24,14 @@ function* init() {
       forumContract = yield call(getContractInstance, { web3, artifact: Forum });
       initFlag = true;
       yield put({
-        type: WEB3_UTILS_SAGA_INITIALIZED, ...[]
+        type: DRIZZLE_UTILS_SAGA_INITIALIZED, ...[]
       });
     }
     catch (error) {
-      console.error(`Error while initializing web3UtilsSaga: ${error}`);
+      console.error(`Error while initializing drizzleUtilsSaga: ${error}`);
+      yield put({
+        type: DRIZZLE_UTILS_SAGA_ERROR, ...[]
+      });
     }
   }
   else
diff --git a/app/src/redux/sagas/orbitSaga.js b/app/src/redux/sagas/orbitSaga.js
index 9725bd8..841f80c 100644
--- a/app/src/redux/sagas/orbitSaga.js
+++ b/app/src/redux/sagas/orbitSaga.js
@@ -6,7 +6,7 @@ import {
   loadDatabases,
   orbitSagaOpen
 } from '../../utils/orbitUtils';
-import { WEB3_UTILS_SAGA_INITIALIZED } from '../actions/web3UtilsActions';
+import { DRIZZLE_UTILS_SAGA_INITIALIZED } from '../actions/drizzleUtilsActions';
 import {
   ADD_PEER_DATABASE, PEER_DATABASE_ADDED,
   DATABASES_CREATED,
@@ -95,7 +95,7 @@ function* updatePeersState() {
 
 function* orbitSaga() {
   yield all([
-    take(WEB3_UTILS_SAGA_INITIALIZED),
+    take(DRIZZLE_UTILS_SAGA_INITIALIZED),
     take(IPFS_INITIALIZED)
   ]);
   yield takeLatest(ACCOUNT_CHANGED, getOrbitDBInfo);
diff --git a/app/src/redux/sagas/transactionsSaga.js b/app/src/redux/sagas/transactionsSaga.js
index b69cb72..b39f944 100644
--- a/app/src/redux/sagas/transactionsSaga.js
+++ b/app/src/redux/sagas/transactionsSaga.js
@@ -2,7 +2,7 @@ import { call, select, take, takeEvery } from 'redux-saga/effects';
 
 import { drizzle } from '../../index';
 import { orbitSagaPut } from '../../utils/orbitUtils';
-import { WEB3_UTILS_SAGA_INITIALIZED } from '../actions/web3UtilsActions';
+import { DRIZZLE_UTILS_SAGA_INITIALIZED } from '../actions/drizzleUtilsActions';
 import { CONTRACT_EVENT_FIRED } from './eventSaga';
 
 const transactionsHistory = Object.create(null);
@@ -72,7 +72,7 @@ function* handleError() {
 }
 
 function* transactionsSaga() {
-  yield take(WEB3_UTILS_SAGA_INITIALIZED);
+  yield take(DRIZZLE_UTILS_SAGA_INITIALIZED);
   yield takeEvery('INIT_TRANSACTION', initTransaction);
   yield takeEvery(CONTRACT_EVENT_FIRED, handleEvent);
   yield takeEvery('TX_ERROR', handleError);
diff --git a/app/src/redux/sagas/userSaga.js b/app/src/redux/sagas/userSaga.js
index a4cb2ae..d3edcf5 100644
--- a/app/src/redux/sagas/userSaga.js
+++ b/app/src/redux/sagas/userSaga.js
@@ -1,7 +1,7 @@
 import { call, put, select, take, takeEvery } from 'redux-saga/effects';
 
 import { forumContract, getCurrentAccount } from './drizzleUtilsSaga';
-import { WEB3_UTILS_SAGA_INITIALIZED } from '../actions/web3UtilsActions';
+import { DRIZZLE_UTILS_SAGA_INITIALIZED } from '../actions/drizzleUtilsActions';
 import {
   ACCOUNT_CHANGED,
   AUTH_USER_DATA_UPDATED,
@@ -61,7 +61,7 @@ function* getUserState() {
 }
 
 function* userSaga() {
-  yield take(WEB3_UTILS_SAGA_INITIALIZED);
+  yield take(DRIZZLE_UTILS_SAGA_INITIALIZED);
   yield takeEvery(ACCOUNTS_FETCHED, updateUserData);
 }
 
diff --git a/app/src/router/routes.js b/app/src/router/routes.js
index b923bba..cfb7b9e 100644
--- a/app/src/router/routes.js
+++ b/app/src/router/routes.js
@@ -2,10 +2,10 @@ import React from 'react';
 import { Redirect, Route, Switch } from 'react-router-dom';
 import CoreLayoutContainer from '../components/CoreLayoutContainer';
 import HomeContainer from '../components/HomeContainer';
-import SignUpContainer from '../containers/SignUpContainer';
-import StartTopicContainer from '../containers/StartTopicContainer';
-import TopicContainer from '../containers/TopicContainer';
-import ProfileContainer from '../containers/ProfileContainer';
+import SignUpContainer from '../components/SignUpContainer';
+import StartTopicContainer from '../components/StartTopicContainer';
+import TopicContainer from '../components/TopicContainer';
+import ProfileContainer from '../components/ProfileContainer';
 import NotFound from '../components/NotFound';
 
 const routes = (