diff --git a/front-ui/app/components/account/login.js b/front-ui/app/components/account/login.js
index fd72fa8..6592188 100644
--- a/front-ui/app/components/account/login.js
+++ b/front-ui/app/components/account/login.js
@@ -83,42 +83,29 @@ var Login = React.createClass({
         }
     },
     render : function() {
-        return (<div>
-                <div className="col-md-6">
+        return (
+          <div className="col-lg-4 col-md-6 col-sm-8 col-xs-10 col-centered" style={{height: 500}}>
 
-                <span className="h3">Prijava </span>
-                {this.renderLoginFailure()}
-                <div className="center" >
-                <form className="form-horizontal">
+                  <h1 style={{paddingTop: 40}} className="text-center">Prijava</h1>
+                  <br />
+                  {this.renderLoginFailure()}
 
-                <div className="form-group">
-                <label for="email">Email adresa</label>
-                <input type="email" onKeyPress={this.onKeyPress} onChange={this.handleChange('email')} className="form-control" id="email" placeholder="Unesite email"></input>
+                  <form className>
+                    <div className="form-group col-lg-12 col-md-12">
+                      <input style={{marginBottom: 8}} type="text" className="form-control" onKeyPress={this.onKeyPress} onChange={this.handleChange('email')} placeholder="Email adresa" />
+                        {this.getValidationMessages('email').map(this.renderErrorMessage)}
 
-                {this.getValidationMessages('email').map(this.renderErrorMessage)}
-                </div>
-                <div className="form-group">
-                <label for="password">Šifra</label>
-                <input type="password" onKeyPress={this.onKeyPress} onChange={this.handleChange('password')} className="form-control" id="password" placeholder="Šifra"></input>
+                    </div>
+                    <div className="form-group col-lg-12 col-md-12">
+                      <input style={{marginBottom: 8}} type="password" onKeyPress={this.onKeyPress} onChange={this.handleChange('password')}  className="form-control" placeholder="Šifra" />
+                        {this.getValidationMessages('password').map(this.renderErrorMessage)}
 
-                {this.getValidationMessages('password').map(this.renderErrorMessage)}
-                </div>
-                <div className="form-group">
-                <button type="button" onClick={this.onLoginClick} className="btn btn-success">Prijava</button>
-                </div>
-                </form>
-                </div>
-
-
-                </div>
-                <div className="col-md-6">
-                <Link to="registracija">
-
-                Niste registrovani? Kliknite ovdje da se registrujete!
-                </Link>
-
-
-                </div>
+                    </div>
+                    <input style={{color: 'white', fontWeight: 'bold', height: 44}} type="submit" onClick={this.onLoginClick} className=" mybutton center-block col-md-8 col-sm-8 col-xs-8 col-sm-push-2 col-xs-push-2 col-md-push-2" defaultValue="Prijava" />
+                  </form>
+                  <div className="text-center col-lg-12">
+                    <h4>Niste registrovani?  <Link to="registracija"><span>Registrujte se</span></Link></h4>
+                  </div>
                 </div>);
     }
 });
diff --git a/front-ui/app/components/account/register.js b/front-ui/app/components/account/register.js
index 7e1543e..970e51a 100644
--- a/front-ui/app/components/account/register.js
+++ b/front-ui/app/components/account/register.js
@@ -327,7 +327,7 @@ var Register = React.createClass({
             <input style={{color: 'white', fontWeight: 'bold', height: 44}} type="submit" onClick={this.onRegisterClick} className=" mybutton center-block col-md-8 col-sm-8 col-xs-8 col-sm-push-2 col-xs-push-2 col-md-push-2" defaultValue="REGISTRUJ ME" />
           </form>
           <div className="text-center col-lg-12 col-md-12 col-sm-12 col-xs-12">
-            <h4>Već imate profil? <a href="Prijava.html"><span> Prijavite se</span></a></h4>
+            <h4>Već imate profil? <Link to="login"><span> Prijavite se</span></Link></h4>
           </div>
         </div>
       </div>