diff --git a/Sevomin.News/Web.config b/Sevomin.News/Web.config
index da216e1..f6ffa6f 100644
--- a/Sevomin.News/Web.config
+++ b/Sevomin.News/Web.config
@@ -24,7 +24,7 @@
       <forms defaultUrl="~/" loginUrl="~/views/login.cshtml" name="miniblog" timeout="10080">
         <credentials passwordFormat="SHA1">
           <!-- Password is "demo". Generate your hash password here http://www.stringfunction.com/sha1-hash.html -->
-          <user name="sevomin" password="b7986da6e43a61189f546cc51a0b37dcad99e079"/>
+          <user name="admin" password="b7986da6e43a61189f546cc51a0b37dcad99e079"/>
         </credentials>
       </forms>
     </authentication>
diff --git a/Sevomin.News/fonts/glyphicons-halflings-regular.eot b/Sevomin.News/css/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from Sevomin.News/fonts/glyphicons-halflings-regular.eot
rename to Sevomin.News/css/fonts/glyphicons-halflings-regular.eot
diff --git a/Sevomin.News/fonts/glyphicons-halflings-regular.svg b/Sevomin.News/css/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from Sevomin.News/fonts/glyphicons-halflings-regular.svg
rename to Sevomin.News/css/fonts/glyphicons-halflings-regular.svg
diff --git a/Sevomin.News/fonts/glyphicons-halflings-regular.ttf b/Sevomin.News/css/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from Sevomin.News/fonts/glyphicons-halflings-regular.ttf
rename to Sevomin.News/css/fonts/glyphicons-halflings-regular.ttf
diff --git a/Sevomin.News/fonts/glyphicons-halflings-regular.woff b/Sevomin.News/css/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from Sevomin.News/fonts/glyphicons-halflings-regular.woff
rename to Sevomin.News/css/fonts/glyphicons-halflings-regular.woff
diff --git a/Sevomin.News/themes/Sevomin/Post.cshtml b/Sevomin.News/themes/Sevomin/Post.cshtml
index bd59fe3..f7c4730 100644
--- a/Sevomin.News/themes/Sevomin/Post.cshtml
+++ b/Sevomin.News/themes/Sevomin/Post.cshtml
@@ -8,52 +8,50 @@
 }
 else
 {
-    <article class="post" data-id="@Model.ID" itemscope itemtype="http://schema.org/BlogPosting" itemprop="blogPost">
-        <header class="jumbotron">
-            <h1 itemprop="headline name">
-                <a href="@Model.Url" itemprop="url">@Model.Title</a>
-            </h1>
-            <div>
-                <abbr title="@Model.PubDate.ToLocalTime()" itemprop="datePublished">@Model.PubDate.ToLocalTime().ToString("MMMM d. yyyy")</abbr>
-                <a href="@Model.Url#comments">
-                    <em class="glyphicon glyphicon-comment"></em>
-                    @Model.CountApprovedComments(Context) Comments
-                </a>
-                @Categories()
-            </div>
-        </header>
+    <article class="post rtl" data-id="@Model.ID" itemscope itemtype="http://schema.org/BlogPosting" itemprop="blogPost">        
+        <h1 itemprop="headline name">
+            <a href="@Model.Url" itemprop="url">@Model.Title</a>
+        </h1>
+        <div>            
+            <a href="@Model.Url#comments">
+                <em class="glyphicon glyphicon-comment"></em>
+                @Model.CountApprovedComments(Context) نظر
+            </a>
+            <abbr title="@Model.PubDate.ToLocalTime()" itemprop="datePublished">@Model.PubDate.ToLocalTime().ToString("MMMM d. yyyy")</abbr>
+            @Categories()
+        </div>
 
         <div itemprop="articleBody">@Html.Raw(Model.Content)</div>
-        @if (Blog.CurrentPost != null)
-        {
-            <section id="comments" aria-label="Comments">
-                @if (Model.CountApprovedComments(Context) > 0)
-                {
-                    <h2>Comments</h2>
-                }
+            @if (Blog.CurrentPost != null)
+            {
+                <section id="comments" aria-label="Comments">
+                    @if (Model.CountApprovedComments(Context) > 0)
+                    {
+                        <h2>نظرات</h2>
+                    }
 
-                @foreach (Comment comment in Model.Comments)
-                {
-                    if (comment.IsApproved || !Blog.ModerateComments || Context.User.Identity.IsAuthenticated)
+                    @foreach (Comment comment in Model.Comments)
                     {
-                        @RenderPage("Comment.cshtml", comment)
+                        if (comment.IsApproved || !Blog.ModerateComments || Context.User.Identity.IsAuthenticated)
+                        {
+                            @RenderPage("Comment.cshtml", comment)
+                        }
                     }
-                }
-            </section>
+                </section>
 
-            if (Model.AreCommentsOpen(Context))
-            {
-                @RenderPage("~/views/CommentForm.cshtml")
+                if (Model.AreCommentsOpen(Context))
+                {
+                    @RenderPage("~/views/CommentForm.cshtml")
+                }
             }
-        }
     </article>
 
     @helper Categories()
 {
     if (Model.Categories.Length > 0)
     {
-        <ul class="categories">
-            <li><em class="glyphicon glyphicon-bookmark"></em> Posted in: </li>
+        <ul class="categories rtl">
+            <li><em class="glyphicon glyphicon-bookmark"></em> ارسال شده در: </li>
             @foreach (string cat in Model.Categories)
             {
                 <li itemprop="articleSection">
diff --git a/Sevomin.News/themes/Sevomin/common.css b/Sevomin.News/themes/Sevomin/common.css
index efada67..1e17802 100644
--- a/Sevomin.News/themes/Sevomin/common.css
+++ b/Sevomin.News/themes/Sevomin/common.css
@@ -1,45 +1,43 @@
 @font-face {
-  font-family: 'Koodak';
-  src: url('/fonts/BKoodakBold.eot?#') format('eot'),  /* IE6–8 */
-       url('/fonts/BKoodakBold.woff') format('woff'),  /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
-       url('/fonts/BKoodakBold.ttf') format('truetype');  /* Saf3—5, Chrome4+, FF3.5, Opera 10+ */
+    font-family: 'Koodak';
+    src: url('/fonts/BKoodakBold.eot?#') format('eot'), /* IE6–8 */
+    url('/fonts/BKoodakBold.woff') format('woff'), /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
+    url('/fonts/BKoodakBold.ttf') format('truetype'); /* Saf3—5, Chrome4+, FF3.5, Opera 10+ */
 }
+
 @font-face {
     font-family: 'Yekan';
     src: url('/fonts/WebYekan.eot');
-    src: url('/fonts/WebYekan.eot?#iefix') format('embedded-opentype'),
-         url('/fonts/WebYekan.woff') format('woff'),
-         url('/fonts/WebYekan.ttf') format('truetype'),
-         url('/fonts/WebYekan.svg#WebYekan') format('svg');
+    src: url('/fonts/WebYekan.eot?#iefix') format('embedded-opentype'), url('/fonts/WebYekan.woff') format('woff'), url('/fonts/WebYekan.ttf') format('truetype'), url('/fonts/WebYekan.svg#WebYekan') format('svg');
     font-weight: normal;
     font-style: normal;
     unicode-range: U+0600–06FF;
 }
 
-body{
+body {
     font-family: Yekan, "Helvetica Neue",Helvetica,Arial,sans-serif;
     padding: 60px;
 }
 
-h1, h2, h3, h4, h5, h6{
-    font-family: Koodak, "Helvetica Neue",Helvetica,Arial,sans-serif;    
+h1, h2, h3, h4, h5, h6 {
+    font-family: Koodak, "Helvetica Neue",Helvetica,Arial,sans-serif;
 }
 
-.rtl{
+.rtl {
     direction: rtl !important;
     text-align: right !important;
 }
 
-.ltr{
+.ltr {
     direction: ltr !important;
     text-align: left !important;
 }
 
-.center-text{
+.center-text {
     text-align: center !important;
 }
 
-th{
+th {
     text-align: right;
 }
 
@@ -62,33 +60,33 @@ th{
     padding: 10px 15px 0px 15px !important;
 }*/
 
-.navbar-brand img{
+.navbar-brand img {
     height: 25px;
 }
 
-.job-list-top-toolbar, .job-list-bottom-toolbar{    
+.job-list-top-toolbar, .job-list-bottom-toolbar {
     text-align: left !important;
 }
 
-.job-list-top-toolbar{
-    padding: 0px 10px 10px 0px;    
+.job-list-top-toolbar {
+    padding: 0px 10px 10px 0px;
     margin-bottom: 5px;
 }
 
-.job-list-bottom-toolbar{
-    padding: 10px 10px 0px 0px;    
+.job-list-bottom-toolbar {
+    padding: 10px 10px 0px 0px;
 }
 
-.job-list-bottom-toolbar .date{
-    float: right;
-}
+    .job-list-bottom-toolbar .date {
+        float: right;
+    }
 
-#login-intro-text{
+#login-intro-text {
     line-height: 1.5em;
     font-size: 1.3em;
 }
 
-#login-intro-box{
+#login-intro-box {
     border-radius: 5px;
     border: 1px solid #808080;
     margin: 10px;
@@ -96,11 +94,15 @@ th{
     background: #dcdcdc;
 }
 
-.footer{
+.footer {
     padding-top: 40px;
     padding-bottom: 40px;
     margin-top: 100px;
     color: #777;
     text-align: center;
     border-top: 1px solid #e5e5e5;
-}
\ No newline at end of file
+}
+
+.post header div .categories li {
+    display: inline;
+}
diff --git a/Sevomin.News/views/CommentForm.cshtml b/Sevomin.News/views/CommentForm.cshtml
index 374457e..00b8511 100644
--- a/Sevomin.News/views/CommentForm.cshtml
+++ b/Sevomin.News/views/CommentForm.cshtml
@@ -1,37 +1,36 @@
-<form id="commentform" role="form" class="form-horizontal" data-token="@Blog.UniqueId">
+<form id="commentform" role="form" class="form-horizontal rtl" data-token="@Blog.UniqueId">
     <fieldset>
-        <legend>Post comment</legend>
+        <legend>ارسال نظرات</legend>
 
         <div class="form-group">
-            <label for="commentname" class="control-label col-sm-2">Name</label>
+            <label for="commentname" class="control-label col-sm-2 col-sm-push-8">نام</label>
             <div class="col-sm-7">
-                <input id="commentname" class="form-control" type="text" placeholder="Name" required />
+                <input id="commentname" class="form-control" type="text" placeholder="نام" required />
             </div>
         </div>
 
         <div class="form-group">
-            <label for="commentemail" class="control-label col-sm-2">Email</label>
+            <label for="commentemail" class="control-label col-sm-2 col-sm-push-8">ایمیل</label>
             <div class="col-sm-7">
-                <input id="commentemail" class="form-control" type="email" placeholder="Email" required />
+                <input id="commentemail" class="form-control" type="email" placeholder="آدرس ایمیل" required />
             </div>
         </div>
 
         <div class="form-group">
-            <label for="commenturl" class="control-label col-sm-2">Website</label>
+            <label for="commenturl" class="control-label col-sm-2 col-sm-push-8">وب سایت</label>
             <div class="col-sm-7">
-                <input id="commenturl" class="form-control" type="url" placeholder="Website URL" />
+                <input id="commenturl" class="form-control" type="url" placeholder="آدرس وب سایت" />
             </div>
         </div>
 
         <div class="form-group">
-            <div class="col-sm-12">
-                <label for="commentcontent" class="control-label">Comment (no HTML allowed)</label>
-                <textarea id="commentcontent" class="form-control" rows="4" placeholder="Comment" required></textarea>
+            <div class="col-sm-12">                
+                <textarea id="commentcontent" class="form-control" rows="4" placeholder="نظر" required></textarea>
             </div>
         </div>
 
         <div class="form-group col-sm-12">
-            <button class="btn btn-primary">Post comment</button>
+            <button class="btn btn-primary">ارسال نظر</button>
             <span id="status" class="alert" role="status" aria-live="polite"></span>
         </div>
     </fieldset>