diff --git a/src/Navbar/index.js b/src/Navbar/index.js
index cab7e0c..8638ff2 100644
--- a/src/Navbar/index.js
+++ b/src/Navbar/index.js
@@ -5,13 +5,21 @@ export default () => (
   <nav className="navigation">
     <section className="container">
       <Link className="navigation-title" to="/"><h1 className="title">Contest Portal</h1></Link>
-      <ul className="navigation-list float-right">
-        {!window.email ?
+        {
+          !window.email ?
+          <ul className="navigation-list float-right">
           <li className="navigation-item"><Link to='/login' className="navigation-link">Login</Link></li>
+          </ul>
           :
-          <li className="navigation-item"><Link to='/logout' className="navigation-link">Logout</Link></li>
+          <ul className="navigation-list float-right">
+            <li className="navigation-item">
+              <Link to='/' className="navigation-link">Hello {window.email}</Link>
+            </li>
+            <li className="navigation-item">
+              <Link to='/logout' className="navigation-link">Logout</Link>
+            </li>
+          </ul>
         }
-      </ul>
     </section>
   </nav>
 )
diff --git a/src/QuestionViewer/index.js b/src/QuestionViewer/index.js
index cd35227..e16a10d 100644
--- a/src/QuestionViewer/index.js
+++ b/src/QuestionViewer/index.js
@@ -21,10 +21,14 @@ class QuestionViewer extends Component {
       <div>
         {loading && <div>Loading...</div>}
         <h1>Q{question.qno}: {question.title}</h1>
+        {error && <div className="error">ERROR: {error}</div>}
         <p>
           {question.body}
         </p>
-        {error && <div className="error">ERROR: {error}</div>}
+        <ul class="Nav">
+        <li><a rel="prev" href="question/1" id="prv">&lt; Prev</a></li>
+        <li><a rel="next" href="/question/2" id="nxt">Next &gt;</a></li>
+        </ul>
       </div>
     )
   }
diff --git a/src/index.css b/src/index.css
index d29c531..e8697a3 100644
--- a/src/index.css
+++ b/src/index.css
@@ -17,3 +17,47 @@
 .error {
   color: red;
 }
+
+ul.Nav {
+	padding:0;
+	list-style-type:none;
+}
+ul.Nav li {
+	display: inline;
+}
+
+ul.Nav  li a {
+	/*background-color: #6E6E6E;*/
+	background-color:#9b4dca;
+	color: #FFF;
+	border: 1.5px solid #333;
+	font-size: 16px;
+	font-weight: 600;
+	padding: 1.5px 12px;
+	margin: 0 4px;
+	text-decoration: none;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	box-shadow: 0 0 5px 0 gray;
+	-moz-box-shadow: 0 0 5px 0 gray;
+	-webkit-box-shadow: 0 0 5px 0 gray;	
+}
+
+
+ul.Nav  li a#prv{
+	float: left;
+}
+
+ul.Nav  li a#nxt{
+	float: right;
+}
+
+
+ul.Nav a:hover, ul.Nav a:focus {
+	background-color: #FFF;
+	color: #9b4dca;
+	box-shadow: none;
+	-moz-box-shadow: none;
+	-webkit-box-shadow: none;
+}