diff --git a/application/admin/view/addon/index.html b/application/admin/view/addon/index.html
index 19ecc105..f220cd83 100644
--- a/application/admin/view/addon/index.html
+++ b/application/admin/view/addon/index.html
@@ -93,7 +93,7 @@
                         <a class="btn btn-primary btn-userinfo btn-mini-xs" href="javascript:;"><i class="fa fa-user"></i> {:__('Userinfo')}</a>
                         {/if}
                     </div>
-                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap" width="100%">
+                    <table id="table" class="table table-striped table-bordered table-hover" width="100%">
 
                     </table>
 
diff --git a/application/admin/view/index/login.html b/application/admin/view/index/login.html
index 5c04d7b5..762108ca 100644
--- a/application/admin/view/index/login.html
+++ b/application/admin/view/index/login.html
@@ -99,6 +99,7 @@
                     <p id="profile-name" class="profile-name-card"></p>
 
                     <form action="" method="post" id="login-form">
+                        <!--@AdminLoginFormBegin-->
                         <div id="errtips" class="hide"></div>
                         {:token()}
                         <div class="input-group">
@@ -110,15 +111,17 @@
                             <div class="input-group-addon"><span class="glyphicon glyphicon-lock" aria-hidden="true"></span></div>
                             <input type="password" class="form-control" id="pd-form-password" placeholder="{:__('Password')}" name="password" autocomplete="off" value="" data-rule="{:__('Password')}:required;password"/>
                         </div>
+                        <!--@CaptchaBegin-->
                         {if $Think.config.fastadmin.login_captcha}
                         <div class="input-group">
                             <div class="input-group-addon"><span class="glyphicon glyphicon-option-horizontal" aria-hidden="true"></span></div>
                             <input type="text" name="captcha" class="form-control" placeholder="{:__('Captcha')}" data-rule="{:__('Captcha')}:required;length({$Think.config.captcha.length})" autocomplete="off"/>
                             <span class="input-group-addon" style="padding:0;border:none;cursor:pointer;">
-                                        <img src="{:rtrim('__PUBLIC__', '/')}/index.php?s=/captcha" width="100" height="30" onclick="this.src = '{:rtrim('__PUBLIC__', '/')}/index.php?s=/captcha&r=' + Math.random();"/>
-                                    </span>
+                                    <img src="{:rtrim('__PUBLIC__', '/')}/index.php?s=/captcha" width="100" height="30" onclick="this.src = '{:rtrim('__PUBLIC__', '/')}/index.php?s=/captcha&r=' + Math.random();"/>
+                            </span>
                         </div>
                         {/if}
+                        <!--@CaptchaEnd-->
                         <div class="form-group checkbox">
                             <label class="inline" for="keeplogin">
                                 <input type="checkbox" name="keeplogin" id="keeplogin" value="1"/>
@@ -128,6 +131,7 @@
                         <div class="form-group">
                             <button type="submit" class="btn btn-success btn-lg btn-block" style="background:#708eea;">{:__('Sign in')}</button>
                         </div>
+                        <!--@AdminLoginFormEnd-->
                     </form>
                 </div>
             </div>
diff --git a/application/index/view/user/login.html b/application/index/view/user/login.html
index 4e2b5e64..eb3ecfb7 100755
--- a/application/index/view/user/login.html
+++ b/application/index/view/user/login.html
@@ -3,6 +3,7 @@
         <div class="logon-tab clearfix"><a class="active">{:__('Sign in')}</a> <a href="{:url('user/register')}?url={$url|urlencode|htmlentities}">{:__('Sign up')}</a></div>
         <div class="login-main">
             <form name="form" id="login-form" class="form-vertical" method="POST" action="">
+                <!--@IndexLoginFormBegin-->
                 <input type="hidden" name="url" value="{$url|htmlentities}"/>
                 {:token()}
                 <div class="form-group">
@@ -32,6 +33,7 @@
                     <button type="submit" class="btn btn-primary btn-lg btn-block">{:__('Sign in')}</button>
                     <a href="{:url('user/register')}?url={$url|urlencode|htmlentities}" class="btn btn-default btn-lg btn-block mt-3 no-border">还没有账号？点击注册</a>
                 </div>
+                <!--@IndexLoginFormEnd-->
             </form>
         </div>
     </div>
diff --git a/application/index/view/user/register.html b/application/index/view/user/register.html
index c842b5e6..14920372 100644
--- a/application/index/view/user/register.html
+++ b/application/index/view/user/register.html
@@ -1,10 +1,11 @@
 <div id="content-container" class="container">
     <div class="user-section login-section">
-        <div class="logon-tab clearfix"> <a href="{:url('user/login')}?url={$url|urlencode|htmlentities}">{:__('Sign in')}</a> <a class="active">{:__('Sign up')}</a> </div>
+        <div class="logon-tab clearfix"><a href="{:url('user/login')}?url={$url|urlencode|htmlentities}">{:__('Sign in')}</a> <a class="active">{:__('Sign up')}</a></div>
         <div class="login-main">
             <form name="form1" id="register-form" class="form-vertical" method="POST" action="">
-                <input type="hidden" name="invite_user_id" value="0" />
-                <input type="hidden" name="url" value="{$url|htmlentities}" />
+                <!--@IndexRegisterFormBegin-->
+                <input type="hidden" name="invite_user_id" value="0"/>
+                <input type="hidden" name="url" value="{$url|htmlentities}"/>
                 {:token()}
                 <div class="form-group">
                     <label class="control-label required">{:__('Email')}<span class="text-success"></span></label>
@@ -35,6 +36,7 @@
                     </div>
                 </div>
 
+                <!--@CaptchaBegin-->
                 {if $captchaType}
                 <div class="form-group">
                     <label class="control-label">{:__('Captcha')}</label>
@@ -46,11 +48,13 @@
                     </div>
                 </div>
                 {/if}
+                <!--@CaptchaEnd-->
 
                 <div class="form-group">
                     <button type="submit" class="btn btn-primary btn-lg btn-block">{:__('Sign up')}</button>
                     <a href="{:url('user/login')}?url={$url|urlencode|htmlentities}" class="btn btn-default btn-lg btn-block mt-3 no-border">已经有账号？点击登录</a>
                 </div>
+                <!--@IndexRegisterFormEnd-->
             </form>
         </div>
     </div>