diff --git a/client/src/app-components/are-you-sure.js b/client/src/app-components/are-you-sure.js
index 55dc6f8c..eea92f55 100644
--- a/client/src/app-components/are-you-sure.js
+++ b/client/src/app-components/are-you-sure.js
@@ -27,7 +27,7 @@ class AreYouSure extends React.Component {
         password: ''
     };
 
-    static openModal(description, onYes, type) {
+    static openModal(description, onYes, type = 'default') {
         ModalContainer.openModal(
             <AreYouSure description={description} onYes={onYes} type={type}/>,
             true
diff --git a/client/src/app-components/topic-viewer.js b/client/src/app-components/topic-viewer.js
index d54164ff..d35f08c3 100644
--- a/client/src/app-components/topic-viewer.js
+++ b/client/src/app-components/topic-viewer.js
@@ -72,7 +72,7 @@ class TopicViewer extends React.Component {
 
     renderDeleteButton() {
         return (
-            <span onClick={AreYouSure.openModal.bind(this, i18n('DELETE_TOPIC_DESCRIPTION'), this.onDeleteClick.bind(this))}>
+            <span onClick={() => AreYouSure.openModal(i18n('DELETE_TOPIC_DESCRIPTION'), this.onDeleteClick.bind(this))}>
                 <Icon className="topic-viewer__edit-icon" name="trash" />
             </span>
         );
diff --git a/client/src/app/install/install-step-4-user-system.js b/client/src/app/install/install-step-4-user-system.js
index 2bdb8de9..24ae7dce 100644
--- a/client/src/app/install/install-step-4-user-system.js
+++ b/client/src/app/install/install-step-4-user-system.js
@@ -64,7 +64,9 @@ class InstallStep4UserSystem extends React.Component {
             }
         }).then(() => this.setState({
             loading: false
-        }, () => history.push('/install/step-5'))));
+        }, () => history.push('/install/step-5'))).catch(() => this.setState({
+            loading: false
+        })));
     }
 
     isDisabled() {
diff --git a/client/src/app/install/install-step-6-completed.js b/client/src/app/install/install-step-6-completed.js
index 32d15a68..151fdbaf 100644
--- a/client/src/app/install/install-step-6-completed.js
+++ b/client/src/app/install/install-step-6-completed.js
@@ -10,9 +10,11 @@ import Message from 'core-components/message';
 class InstallStep6Completed extends React.Component {
 
     componentDidMount() {
+        store.dispatch(ConfigActions.init());
+
         setTimeout(() => {
             store.dispatch(ConfigActions.checkInstallation());
-        }, 5000);
+        }, 3000);
     }
 
     render() {
diff --git a/client/src/app/main/main-home/main-home-page-login-widget.js b/client/src/app/main/main-home/main-home-page-login-widget.js
index 2c2e77be..47e34583 100644
--- a/client/src/app/main/main-home/main-home-page-login-widget.js
+++ b/client/src/app/main/main-home/main-home-page-login-widget.js
@@ -68,7 +68,7 @@ class MainHomePageLoginWidget extends React.Component {
             <Widget className="main-home-page__widget login-widget_password" title={i18n('RECOVER_PASSWORD')} ref="recoverWidget">
                 <Form {...this.getRecoverFormProps()}>
                     <div className="login-widget__inputs">
-                        <FormField placeholder="email" name="email" className="login-widget__input" validation="EMAIL" required/>
+                        <FormField placeholder={i18n('EMAIL_LOWERCASE')} name="email" className="login-widget__input" validation="EMAIL" required/>
                     </div>
                     <div className="login-widget__submit-button">
                         <SubmitButton type="primary">{i18n('RECOVER_PASSWORD')}</SubmitButton>
diff --git a/client/src/app/main/main-layout-header.scss b/client/src/app/main/main-layout-header.scss
index b4491020..99f45752 100644
--- a/client/src/app/main/main-layout-header.scss
+++ b/client/src/app/main/main-layout-header.scss
@@ -3,8 +3,8 @@
 .main-layout-header {
     background-color: $primary-blue;
     border-radius: 4px 4px 0 0;
-    height: 32px;
     width: 100%;
+    position: relative;
 
     &__user-name {
         color: $primary-red;
@@ -19,9 +19,16 @@
     }
 
     &__languages {
+        display: inline-block;
         float: right;
         position: relative;
         top: 5px;
-        left: -6px;
+        margin: 0 6px;
+    }
+
+    @media screen and (max-width: 500px) {
+        .main-layout-header__languages {
+            float: none;
+        }
     }
 }
\ No newline at end of file
diff --git a/client/src/app/main/main-signup/main-signup-page.scss b/client/src/app/main/main-signup/main-signup-page.scss
index 866d62f3..f3110435 100644
--- a/client/src/app/main/main-signup/main-signup-page.scss
+++ b/client/src/app/main/main-signup/main-signup-page.scss
@@ -1,5 +1,5 @@
 .main-signup-page {
-    height: 669px;
+    min-height: 669px;
 
     .signup-widget {
         padding: 30px;
diff --git a/client/src/core-components/input.scss b/client/src/core-components/input.scss
index f312de99..6621ed8d 100644
--- a/client/src/core-components/input.scss
+++ b/client/src/core-components/input.scss
@@ -2,6 +2,7 @@
 
 .input {
     display: block;
+    max-width: 100%;
 
     &__text {
         border: 1px solid $grey;
@@ -20,7 +21,7 @@
     }
 
     &_auto {
-        width: 100%;
+        max-width: 100%;
     }
 
     &_small {
diff --git a/client/src/data/language-list.js b/client/src/data/language-list.js
index a9c9fa8f..fa44755e 100644
--- a/client/src/data/language-list.js
+++ b/client/src/data/language-list.js
@@ -47,7 +47,7 @@ export default {
         data: turkishLanguage
     },
     'in': {
-        name: 'Indian',
+        name: 'Hindi',
         data: indianLanguage
     }
 };
\ No newline at end of file