diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
index d6397483f..da78251c9 100644
--- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
+++ b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
@@ -3141,6 +3141,9 @@ public class FessLabels extends UserMessages {
     /** The key of the message: Folder Name */
     public static final String LABELS_storage_folder_name = "{labels.storage_folder_name}";
 
+    /** The key of the message: Download */
+    public static final String LABELS_storage_button_download = "{labels.storage_button_download}";
+
     /**
      * Assert the property is not null.
      * @param property The value of the property. (NotNull)
diff --git a/src/main/resources/fess_label.properties b/src/main/resources/fess_label.properties
index 9e5155e14..7351818ab 100644
--- a/src/main/resources/fess_label.properties
+++ b/src/main/resources/fess_label.properties
@@ -1038,3 +1038,4 @@ labels.storage_button_upload=Upload
 labels.storage_bucket_name=Bucket Name
 labels.storage_file=File
 labels.storage_folder_name=Folder Name
+labels.storage_button_download=Download
diff --git a/src/main/resources/fess_label_en.properties b/src/main/resources/fess_label_en.properties
index 9e5155e14..7351818ab 100644
--- a/src/main/resources/fess_label_en.properties
+++ b/src/main/resources/fess_label_en.properties
@@ -1038,3 +1038,4 @@ labels.storage_button_upload=Upload
 labels.storage_bucket_name=Bucket Name
 labels.storage_file=File
 labels.storage_folder_name=Folder Name
+labels.storage_button_download=Download
diff --git a/src/main/resources/fess_label_ja.properties b/src/main/resources/fess_label_ja.properties
index 087b80146..b68206ffe 100644
--- a/src/main/resources/fess_label_ja.properties
+++ b/src/main/resources/fess_label_ja.properties
@@ -1038,3 +1038,4 @@ labels.storage_button_upload=アップロード
 labels.storage_bucket_name=バケット名
 labels.storage_file=ファイル
 labels.storage_folder_name=フォルダ名
+labels.storage_button_download=ダウンロード
diff --git a/src/main/webapp/WEB-INF/view/admin/accesstoken/admin_accesstoken_edit.jsp b/src/main/webapp/WEB-INF/view/admin/accesstoken/admin_accesstoken_edit.jsp
index 233e434f1..db231da3e 100644
--- a/src/main/webapp/WEB-INF/view/admin/accesstoken/admin_accesstoken_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/accesstoken/admin_accesstoken_edit.jsp
@@ -61,7 +61,7 @@
                                 </div>
                                 <c:if test="${crudMode==2}">
                                     <div class="form-group row">
-                                        <label for="token" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.access_token_token"/></label>
                                         <div class="col-sm-9">
                                                 ${f:h(token)}
diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp
index 45d04b23f..560cb53d1 100644
--- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp
@@ -77,7 +77,7 @@
                                     <la:errors/>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="name" class="col-sm-12 text-sm-right col-form-label"><la:message
+                                    <label class="col-sm-12 col-form-label"><la:message
                                             key="labels.bad_word_file"/></label>
                                 </div>
                             </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_edit.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_edit.jsp
index d824dcf07..5e52f9adf 100644
--- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_edit.jsp
@@ -99,7 +99,7 @@
                                     <la:errors property="_global"/>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="word" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                    <label for="suggestWord" class="col-sm-3 text-sm-right col-form-label"><la:message
                                             key="labels.bad_word_suggest_word"/></label>
                                     <div class="col-sm-9">
                                         <la:errors property="suggestWord"/>
diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp
index 699e20731..64c75f004 100644
--- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp
@@ -78,10 +78,10 @@
                             </div>
                             <c:if test="${editable}">
                             <div class="form-group row">
-                                <label for="name" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                <label for="badWordFile" class="col-sm-3 text-sm-right col-form-label"><la:message
                                     key="labels.bad_word_file"/></label>
                                 <div class="col-sm-9">
-                                    <input type="file" name="badWordFile" class="form-control-file"/>
+                                    <input type="file" id="badWordFile" name="badWordFile" class="form-control-file"/>
                                 </div>
                             </div>
                             </c:if>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/admin_dict.jsp b/src/main/webapp/WEB-INF/view/admin/dict/admin_dict.jsp
index dcc8606cf..8ee789227 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/admin_dict.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/admin_dict.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_download.jsp
index e01f1fe51..dfa7be908 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_download.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_download.jsp
@@ -86,7 +86,7 @@
                                     <la:errors/>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="name" class="col-sm-12 text-sm-right col-form-label">${f:h(path)}</label>
+                                    <label class="col-sm-12 col-form-label">${f:h(path)}</label>
                                 </div>
                             </div>
                             <div class="card-footer">
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_upload.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_upload.jsp
index ef0cf8284..4cb8aa486 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_upload.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_upload.jsp
@@ -87,10 +87,10 @@
                                     <la:errors/>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="name" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                    <label for="kuromojiFile" class="col-sm-3 text-sm-right col-form-label"><la:message
                                             key="labels.dict_kuromoji_file"/></label>
                                     <div class="col-sm-9">
-                                        <input type="file" name="kuromojiFile" class="form-control-file"/>
+                                        <input type="file" id="kuromojiFile" name="kuromojiFile" class="form-control-file"/>
                                     </div>
                                 </div>
                             </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_details.jsp
index 7491ea1b5..f9ca9a444 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_download.jsp
index 4a4d67f1b..c765a5c18 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_download.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_download.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -87,7 +86,7 @@
                                     <la:errors/>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="name" class="col-sm-12 text-sm-right col-form-label">${f:h(path)}</label>
+                                    <label class="col-sm-12 col-form-label">${f:h(path)}</label>
                                 </div>
                             </div>
                             <div class="card-footer">
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_edit.jsp b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_edit.jsp
index f3dcae5ad..8b2a9429a 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_edit.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -102,7 +101,7 @@
                                     <la:errors property="_global"/>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="term" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                    <label for="inputs" class="col-sm-3 text-sm-right col-form-label"><la:message
                                             key="labels.dict_mapping_source"/></label>
                                     <div class="col-sm-9">
                                         <la:errors property="inputs"/>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_upload.jsp b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_upload.jsp
index a0d9a8299..0b703ee97 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_upload.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_upload.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -87,10 +86,10 @@
                                     <la:errors/>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="name" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                    <label for="charMappingFile" class="col-sm-3 text-sm-right col-form-label"><la:message
                                             key="labels.dict_mapping_file"/></label>
                                     <div class="col-sm-9">
-                                        <input type="file" name="charMappingFile" class="form-control-file"/>
+                                        <input type="file" id="charMappingFile" name="charMappingFile" class="form-control-file"/>
                                     </div>
                                 </div>
                             </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords.jsp b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords.jsp
index ad6339149..e29fdd51a 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_details.jsp
index 5e2014edc..79038e3a9 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_download.jsp
index 5b96da181..6bb4df2ef 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_download.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_download.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -87,7 +86,7 @@
                                     <la:errors/>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="name" class="col-sm-12 text-sm-right col-form-label">${f:h(path)}</label>
+                                    <label class="col-sm-12 col-form-label">${f:h(path)}</label>
                                 </div>
                             </div>
                             <div class="card-footer">
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_edit.jsp b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_edit.jsp
index 1d97f72fa..1ef4a5bc4 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_edit.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -102,7 +101,7 @@
                                     <la:errors property="_global"/>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="term" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                    <label for="input" class="col-sm-3 text-sm-right col-form-label"><la:message
                                             key="labels.dict_protwords_source"/></label>
                                     <div class="col-sm-9">
                                         <la:errors property="input"/>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_upload.jsp b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_upload.jsp
index 0e3bf08fa..272111ebd 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_upload.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_upload.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -87,10 +86,10 @@
                                     <la:errors/>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="name" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                    <label for="protwordsFile" class="col-sm-3 text-sm-right col-form-label"><la:message
                                             key="labels.dict_protwords_file"/></label>
                                     <div class="col-sm-9">
-                                        <input type="file" name="protwordsFile" class="form-control-file"/>
+                                        <input type="file" id="protwordsFile" name="protwordsFile" class="form-control-file"/>
                                     </div>
                                 </div>
                             </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride.jsp
index 80e585d56..6e5d99b5f 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_details.jsp
index 9dff897cc..d013c10dc 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_download.jsp
index 00ecc546c..eb1ce1c4a 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_download.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_download.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -87,7 +86,7 @@
                                     <la:errors/>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="name" class="col-sm-12 text-sm-right col-form-label">${f:h(path)}</label>
+                                    <label class="col-sm-12 col-form-label">${f:h(path)}</label>
                                 </div>
                             </div>
                             <div class="card-footer">
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_edit.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_edit.jsp
index 45ec66a51..4c85d1bd5 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_edit.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -102,7 +101,7 @@
                                     <la:errors property="_global"/>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="term" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                    <label for="input" class="col-sm-3 text-sm-right col-form-label"><la:message
                                             key="labels.dict_stemmeroverride_source"/></label>
                                     <div class="col-sm-9">
                                         <la:errors property="input"/>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_upload.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_upload.jsp
index ca29efe7d..1e32842ec 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_upload.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_upload.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -87,10 +86,10 @@
                                     <la:errors/>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="name" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                    <label for="stemmeroverrideFile" class="col-sm-3 text-sm-right col-form-label"><la:message
                                             key="labels.dict_stemmeroverride_file"/></label>
                                     <div class="col-sm-9">
-                                        <input type="file" name="stemmeroverrideFile" class="form-control-file"/>
+                                        <input type="file" id="stemmeroverrideFile" name="stemmeroverrideFile" class="form-control-file"/>
                                     </div>
                                 </div>
                             </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords.jsp
index 120d66101..dbc29c0cb 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_details.jsp
index c45e905c5..96c55514f 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_download.jsp
index 15b435a5a..e9d0c3bc1 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_download.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_download.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -87,7 +86,7 @@
                                     <la:errors/>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="name" class="col-sm-12 text-sm-right col-form-label">${f:h(path)}</label>
+                                    <label class="col-sm-12 col-form-label">${f:h(path)}</label>
                                 </div>
                             </div>
                             <div class="card-footer">
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_edit.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_edit.jsp
index ee019112b..9c5ce66fc 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_edit.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -102,7 +101,7 @@
                                     <la:errors property="_global"/>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="term" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                    <label for="input" class="col-sm-3 text-sm-right col-form-label"><la:message
                                             key="labels.dict_stopwords_source"/></label>
                                     <div class="col-sm-9">
                                         <la:errors property="input"/>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_upload.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_upload.jsp
index db1209e15..b602a03e9 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_upload.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_upload.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -87,10 +86,10 @@
                                     <la:errors/>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="name" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                    <label for="stopwordsFile" class="col-sm-3 text-sm-right col-form-label"><la:message
                                             key="labels.dict_stopwords_file"/></label>
                                     <div class="col-sm-9">
-                                        <input type="file" name="stopwordsFile" class="form-control-file"/>
+                                        <input type="file" id="stopwordsFile" name="stopwordsFile" class="form-control-file"/>
                                     </div>
                                 </div>
                             </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym.jsp
index a0f2a6e56..65ed48e06 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_details.jsp
index cdfdfa674..bc4962a45 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_download.jsp
index db63fa6e7..c8308c4ff 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_download.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_download.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -87,7 +86,7 @@
                                     <la:errors/>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="name" class="col-sm-12 text-sm-right col-form-label">${f:h(path)}</label>
+                                    <label class="col-sm-12 text-sm-right col-form-label">${f:h(path)}</label>
                                 </div>
                             </div>
                             <div class="card-footer">
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_edit.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_edit.jsp
index 9fb63a73f..4b030d156 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_edit.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -102,7 +101,7 @@
                                     <la:errors property="_global"/>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="term" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                    <label for="inputs" class="col-sm-3 text-sm-right col-form-label"><la:message
                                             key="labels.dict_synonym_source"/></label>
                                     <div class="col-sm-9">
                                         <la:errors property="inputs"/>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_upload.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_upload.jsp
index 405ceb06c..825ea7e3c 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_upload.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_upload.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="dict"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -87,10 +86,10 @@
                                     <la:errors/>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="name" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                    <label for="synonymFile" class="col-sm-3 text-sm-right col-form-label"><la:message
                                             key="labels.dict_synonym_file"/></label>
                                     <div class="col-sm-9">
-                                        <input type="file" name="synonymFile" class="form-control-file"/>
+                                        <input type="file" id="synonymFile" name="synonymFile" class="form-control-file"/>
                                     </div>
                                 </div>
                             </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost.jsp b/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost.jsp
index 57cffec2c..9800a79ba 100644
--- a/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="duplicateHost"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost_details.jsp b/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost_details.jsp
index 1081c6655..564012bfc 100644
--- a/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="duplicateHost"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost_edit.jsp b/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost_edit.jsp
index fa3e931b3..4d94134d7 100644
--- a/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost_edit.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="duplicateHost"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword.jsp
index 33d3bb8c9..1043a54a6 100644
--- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="elevateWord"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_details.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_details.jsp
index f6a91b8d7..c062bb593 100644
--- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="elevateWord"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_download.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_download.jsp
index 2251c8470..a2cb10441 100644
--- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_download.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_download.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="elevateWord"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_edit.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_edit.jsp
index d25be6ee8..e86d42a13 100644
--- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_edit.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="elevateWord"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -96,7 +95,7 @@
                                     <la:errors property="_global"/>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="word" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                    <label for="suggestWord" class="col-sm-3 text-sm-right col-form-label"><la:message
                                             key="labels.elevate_word_suggest_word"/></label>
                                     <div class="col-sm-9">
                                         <la:errors property="suggestWord"/>
diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_upload.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_upload.jsp
index 8b8ff0827..686018c93 100644
--- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_upload.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_upload.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="elevateWord"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -79,10 +78,10 @@
                             </div>
                             <c:if test="${editable}">
                                 <div class="form-group row">
-                                    <label for="name" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                    <label for="elevateWordFile" class="col-sm-3 text-sm-right col-form-label"><la:message
                                             key="labels.elevate_word_file"/></th></label>
                                     <div class="col-sm-9">
-                                        <input type="file" name="elevateWordFile" class="form-control-file"/>
+                                        <input type="file" id="elevateWordFile" name="elevateWordFile" class="form-control-file"/>
                                     </div>
                                 </div>
                             </c:if>
diff --git a/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp b/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp
index cacf05135..f01a62dc4 100644
--- a/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="wizard"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl.jsp b/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl.jsp
index 78bc47082..26c6de8d8 100644
--- a/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="failureUrl"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl_details.jsp b/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl_details.jsp
index 42f810847..543c73b91 100644
--- a/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="failureUrl"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth.jsp b/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth.jsp
index 250c8b824..a05065488 100644
--- a/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="fileAuthentication"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth_details.jsp b/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth_details.jsp
index 61a9851e1..067da2177 100644
--- a/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="fileAuthentication"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth_edit.jsp b/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth_edit.jsp
index 0a7196ffb..90d069a8e 100644
--- a/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth_edit.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="fileAuthentication"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_details.jsp b/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_details.jsp
index 43df8b663..864074e60 100644
--- a/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="fileConfig"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_edit.jsp b/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_edit.jsp
index 29c3360c2..f7821c198 100644
--- a/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_edit.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="fileConfig"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp b/src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp
index 0946ee018..158be401a 100644
--- a/src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="general"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/group/admin_group.jsp b/src/main/webapp/WEB-INF/view/admin/group/admin_group.jsp
index 819dd1b51..0fca57407 100644
--- a/src/main/webapp/WEB-INF/view/admin/group/admin_group.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/group/admin_group.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="group"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/group/admin_group_details.jsp b/src/main/webapp/WEB-INF/view/admin/group/admin_group_details.jsp
index e0ba0ce99..61cee37b3 100644
--- a/src/main/webapp/WEB-INF/view/admin/group/admin_group_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/group/admin_group_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="group"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/group/admin_group_edit.jsp b/src/main/webapp/WEB-INF/view/admin/group/admin_group_edit.jsp
index b4025000f..5e33e51ca 100644
--- a/src/main/webapp/WEB-INF/view/admin/group/admin_group_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/group/admin_group_edit.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="group"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog.jsp b/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog.jsp
index 74a3a7f1b..8525ca13d 100644
--- a/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="jobLog"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog_details.jsp b/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog_details.jsp
index d0bca94b3..7586fb2e5 100644
--- a/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="jobLog"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch.jsp b/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch.jsp
index 2a9883ec1..c8254fc24 100644
--- a/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="keyMatch"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch_details.jsp b/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch_details.jsp
index 763d3ea7d..32e4a2715 100644
--- a/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="keyMatch"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch_edit.jsp b/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch_edit.jsp
index a621d2fbf..5e604d405 100644
--- a/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch_edit.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="keyMatch"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype.jsp b/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype.jsp
index ce4d1682b..b122688f1 100644
--- a/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="labelType"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype_details.jsp b/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype_details.jsp
index 991737bac..a7f5b94e2 100644
--- a/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="labelType"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype_edit.jsp b/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype_edit.jsp
index 77bc6d497..2863890b4 100644
--- a/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype_edit.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="labelType"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -61,7 +60,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="paths" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                    <label for="value" class="col-sm-3 text-sm-right col-form-label"><la:message
                                             key="labels.labeltype_value"/></label>
                                     <div class="col-sm-9">
                                         <la:errors property="value"/>
diff --git a/src/main/webapp/WEB-INF/view/admin/maintenance/admin_maintenance.jsp b/src/main/webapp/WEB-INF/view/admin/maintenance/admin_maintenance.jsp
index 43aa77df5..1d6b37ce6 100644
--- a/src/main/webapp/WEB-INF/view/admin/maintenance/admin_maintenance.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/maintenance/admin_maintenance.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="maintenance"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -126,12 +125,43 @@
                                 </h3>
                             </div>
                             <div class="card-footer">
-                                <button type="submit" class="btn btn-danger"
-                                        name="clearCrawlerIndex"
-                                        value="<la:message key="labels.clear_crawler_index_button"/>">
+                                <button type="button" class="btn btn-danger" data-toggle="modal" data-target="#confirmToClearCrawlerIndex">
                                     <em class="fa fa-trash"></em>
                                     <la:message key="labels.clear_crawler_index_button"/>
                                 </button>
+                                <div class="modal fade" id="confirmToClearCrawlerIndex"
+                                     tabindex="-1" role="dialog">
+                                    <div class="modal-dialog">
+                                        <div class="modal-content bg-danger">
+                                            <div class="modal-header">
+                                                <h4 class="modal-title">
+                                                    <la:message key="labels.clear_crawler_index_button"/>
+                                                </h4>
+                                                <button type="button" class="close" data-dismiss="modal"
+                                                        aria-label="Close">
+                                                    <span aria-hidden="true">×</span>
+                                                </button>
+                                            </div>
+                                            <div class="modal-body">
+                                                <p>
+                                                    <la:message key="labels.crud_delete_confirmation"/>
+                                                </p>
+                                            </div>
+                                            <div class="modal-footer justify-content-between">
+                                                <button type="button" class="btn btn-outline-light"
+                                                        data-dismiss="modal">
+                                                    <la:message key="labels.crud_button_cancel"/>
+                                                </button>
+                                                <button type="submit" class="btn btn-outline-light"
+                                                        name="clearCrawlerIndex"
+                                                        value="<la:message key="labels.crud_button_delete" />">
+                                                    <em class="fa fa-trash"></em>
+                                                    <la:message key="labels.crud_button_delete"/>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
                         </div>
                     </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap.jsp b/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap.jsp
index 2f94e691a..375700bd6 100644
--- a/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="pathMapping"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap_details.jsp b/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap_details.jsp
index 4c03c13e9..4e6f9e57e 100644
--- a/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="pathMapping"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap_edit.jsp b/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap_edit.jsp
index 29de0e0c5..18f2ad7cc 100644
--- a/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap_edit.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="pathMapping"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin.jsp b/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin.jsp
index 0f2fa3074..d1bed9690 100644
--- a/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin.jsp
@@ -74,14 +74,16 @@
                                                     <td>${f:h(artifact.version)}</td>
                                                     <td>
                                                         <c:if test="${editable}">
-                                                            <button type="button" class="btn btn-danger btn-xs"
-                                                                    name="delete" data-toggle="modal"
-                                                                    data-target='#confirmToDelete-${f:h(artifact.name)}-${f:h(artifact.version).replace(".", "\\.")}'
-                                                                    value="<la:message key="labels.design_delete_button" />"
-                                                            >
-                                                                <em class="fa fa-trash"></em>
-                                                                <la:message key="labels.design_delete_button"/>
-                                                            </button>
+                                                            <div class="text-center">
+                                                                <button type="button" class="btn btn-danger btn-xs"
+                                                                        name="delete" data-toggle="modal"
+                                                                        data-target='#confirmToDelete-${f:h(artifact.name)}-${f:h(artifact.version).replace(".", "\\.")}'
+                                                                        value="<la:message key="labels.crud_button_delete" />"
+                                                                >
+                                                                    <em class="fa fa-trash"></em>
+                                                                    <la:message key="labels.crud_button_delete"/>
+                                                                </button>
+                                                            </div>
                                                             <div class="modal fade"
                                                                  id='confirmToDelete-${f:h(artifact.name)}-${f:h(artifact.version)}'
                                                                  tabindex="-1" role="dialog"
diff --git a/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin_installplugin.jsp b/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin_installplugin.jsp
index 517b8d2a5..beafb62ad 100644
--- a/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin_installplugin.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin_installplugin.jsp
@@ -13,7 +13,6 @@
         <jsp:param name="menuType" value="plugin"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent.jsp b/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent.jsp
index 64be37f6b..a76b5e5ac 100644
--- a/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="relatedContent"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent_details.jsp b/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent_details.jsp
index 4aff57dc3..190ae199f 100644
--- a/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="relatedContent"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent_edit.jsp b/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent_edit.jsp
index a120367fd..4d833365b 100644
--- a/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent_edit.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="relatedContent"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery.jsp b/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery.jsp
index 902b4f8fd..117f1c2c7 100644
--- a/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="relatedQuery"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery_details.jsp b/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery_details.jsp
index 51c1a04bb..2731d0799 100644
--- a/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="relatedQuery"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery_edit.jsp b/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery_edit.jsp
index d7c0cfbf3..841ebd77a 100644
--- a/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery_edit.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="relatedQuery"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader.jsp b/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader.jsp
index 74092882b..8b2a3907d 100644
--- a/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="requestHeader"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader_details.jsp b/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader_details.jsp
index 152f72c75..f9c6c415e 100644
--- a/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="requestHeader"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader_edit.jsp b/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader_edit.jsp
index 35734eeb1..6315a90a7 100644
--- a/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader_edit.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="requestHeader"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/role/admin_role.jsp b/src/main/webapp/WEB-INF/view/admin/role/admin_role.jsp
index ca1448868..c8c67e778 100644
--- a/src/main/webapp/WEB-INF/view/admin/role/admin_role.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/role/admin_role.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="role"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/role/admin_role_details.jsp b/src/main/webapp/WEB-INF/view/admin/role/admin_role_details.jsp
index b0bd09149..8c9b3e3b8 100644
--- a/src/main/webapp/WEB-INF/view/admin/role/admin_role_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/role/admin_role_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="role"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/role/admin_role_edit.jsp b/src/main/webapp/WEB-INF/view/admin/role/admin_role_edit.jsp
index 111c0bbbb..5dfd4f8a6 100644
--- a/src/main/webapp/WEB-INF/view/admin/role/admin_role_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/role/admin_role_edit.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="role"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist.jsp b/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist.jsp
index b7be0c915..d1ae542c3 100644
--- a/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="searchList"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -63,7 +62,6 @@
                             </div>
                             <la:form action="/admin/searchlist" styleClass="form-inline" method="GET">
                                 <div class="form-group">
-                                    <label class="sr-only" for="sessionIdSearchBtn"></label>
                                     <la:text styleClass="query form-control" property="q"
                                              title="Search" size="50" maxlength="1000"
                                              placeholder="Type a search query"/>
diff --git a/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist_edit.jsp b/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist_edit.jsp
index db8f9aa3a..deac775cb 100644
--- a/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist_edit.jsp
@@ -13,7 +13,6 @@
         <jsp:param name="menuType" value="searchList"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -91,46 +90,50 @@
                                 </div>
                                 <c:if test="${crudMode==2}">
                                     <div class="form-group row">
-                                        <label for="doc_id" class="col-sm-3 text-sm-right col-form-label">_id</label>
+                                        <label class="col-sm-3 text-sm-right col-form-label">_id</label>
                                         <div class="col-sm-9">${f:h(id)}</div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="doc_id" class="col-sm-3 text-sm-right col-form-label">doc_id</label>
+                                        <label for="doc.doc_id" class="col-sm-3 text-sm-right col-form-label">doc_id</label>
                                         <div class="col-sm-9">
                                                 ${f:h(doc.doc_id)}
-                                            <la:hidden property="doc.doc_id"/>
+                                            <la:hidden styleId="doc.doc_id" property="doc.doc_id"/>
                                         </div>
                                     </div>
                                 </c:if>
                                 <div class="form-group row">
-                                    <label for="url" class="col-sm-3 text-sm-right col-form-label">url</label>
+                                    <label for="doc.url" class="col-sm-3 text-sm-right col-form-label">url</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.url"/>
-                                        <la:text property="doc.url" styleClass="form-control"
+                                        <la:text styleId="doc.url"
+                                                 property="doc.url" styleClass="form-control"
                                                  required="required" data-validation="required"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="title" class="col-sm-3 text-sm-right col-form-label">title</label>
+                                    <label for="doc.title" class="col-sm-3 text-sm-right col-form-label">title</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.title"/>
-                                        <la:text property="doc.title" styleClass="form-control"
+                                        <la:text styleId="doc.title"
+                                                 property="doc.title" styleClass="form-control"
                                                  required="required" data-validation="required"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="role" class="col-sm-3 text-sm-right col-form-label">role</label>
+                                    <label for="doc.role" class="col-sm-3 text-sm-right col-form-label">role</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.role"/>
-                                        <la:textarea property="doc.role" styleClass="form-control"
+                                        <la:textarea styleId="doc.role"
+                                                     property="doc.role" styleClass="form-control"
                                                      data-validation-help="1(username) | 2(groupname) | R(rolename)  e.g. Rguest"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="boost" class="col-sm-3 text-sm-right col-form-label">boost</label>
+                                    <label for="doc.boost" class="col-sm-3 text-sm-right col-form-label">boost</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.boost"/>
-                                        <la:text property="doc.boost" styleClass="form-control"
+                                        <la:text styleId="doc.boost"
+                                                 property="doc.boost" styleClass="form-control"
                                                  title="Floating point number" required="required"
                                                  data-validation="custom"
                                                  data-validation-regexp="(\+|\-)?\d+(\.\d+)?((e|E)(\+|\-)?\d+)?"
@@ -138,138 +141,142 @@
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="label" class="col-sm-3 text-sm-right col-form-label">label</label>
+                                    <label for="doc.label" class="col-sm-3 text-sm-right col-form-label">label</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.label"/>
-                                        <la:textarea property="doc.label" styleClass="form-control"/>
+                                        <la:textarea styleId="doc.label" property="doc.label" styleClass="form-control"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="lang" class="col-sm-3 text-sm-right col-form-label">lang</label>
+                                    <label for="doc.lang" class="col-sm-3 text-sm-right col-form-label">lang</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.lang"/>
-                                        <la:textarea property="doc.lang" styleClass="form-control"/>
+                                        <la:textarea styleId="doc.lang" property="doc.lang" styleClass="form-control"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="mimetype" class="col-sm-3 text-sm-right col-form-label">mimetype</label>
+                                    <label for="doc.mimetype" class="col-sm-3 text-sm-right col-form-label">mimetype</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.mimetype"/>
-                                        <la:text property="doc.mimetype" styleClass="form-control"/>
+                                        <la:text styleId="doc.mimetype" property="doc.mimetype" styleClass="form-control"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="filetype" class="col-sm-3 text-sm-right col-form-label">filetype</label>
+                                    <label for="doc.filetype" class="col-sm-3 text-sm-right col-form-label">filetype</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.filetype"/>
-                                        <la:text property="doc.filetype" styleClass="form-control"/>
+                                        <la:text styleId="doc.filetype" property="doc.filetype" styleClass="form-control"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="filename" class="col-sm-3 text-sm-right col-form-label">filename</label>
+                                    <label for="doc.filename" class="col-sm-3 text-sm-right col-form-label">filename</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.filename"/>
-                                        <la:text property="doc.filename" styleClass="form-control"/>
+                                        <la:text styleId="doc.filename" property="doc.filename" styleClass="form-control"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="content" class="col-sm-3 text-sm-right col-form-label">content</label>
+                                    <label for="doc.content" class="col-sm-3 text-sm-right col-form-label">content</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.content"/>
-                                        <la:text property="doc.content" styleClass="form-control"/>
+                                        <la:text styleId="doc.content" property="doc.content" styleClass="form-control"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="has_cache" class="col-sm-3 text-sm-right col-form-label">has_cache</label>
+                                    <label for="doc.has_cache" class="col-sm-3 text-sm-right col-form-label">has_cache</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.has_cache"/>
-                                        <la:text property="doc.has_cache" styleClass="form-control"/>
+                                        <la:text styleId="doc.has_cache" property="doc.has_cache" styleClass="form-control"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="cache" class="col-sm-3 text-sm-right col-form-label">cache</label>
+                                    <label for="doc.cache" class="col-sm-3 text-sm-right col-form-label">cache</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.cache"/>
-                                        <la:text property="doc.cache" styleClass="form-control"/>
+                                        <la:text styleId="doc.cache" property="doc.cache" styleClass="form-control"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="digest" class="col-sm-3 text-sm-right col-form-label">digest</label>
+                                    <label for="doc.digest" class="col-sm-3 text-sm-right col-form-label">digest</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.digest"/>
-                                        <la:text property="doc.digest" styleClass="form-control"/>
+                                        <la:text styleId="doc.digest" property="doc.digest" styleClass="form-control"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="host" class="col-sm-3 text-sm-right col-form-label">host</label>
+                                    <label for="doc.host" class="col-sm-3 text-sm-right col-form-label">host</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.host"/>
-                                        <la:text property="doc.host" styleClass="form-control"/>
+                                        <la:text styleId="doc.host" property="doc.host" styleClass="form-control"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="site" class="col-sm-3 text-sm-right col-form-label">site</label>
+                                    <label for="doc.site" class="col-sm-3 text-sm-right col-form-label">site</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.site"/>
-                                        <la:text property="doc.site" styleClass="form-control"/>
+                                        <la:text styleId="doc.site" property="doc.site" styleClass="form-control"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="segment" class="col-sm-3 text-sm-right col-form-label">segment</label>
+                                    <label for="doc.segment" class="col-sm-3 text-sm-right col-form-label">segment</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.segment"/>
-                                        <la:text property="doc.segment" styleClass="form-control"/>
+                                        <la:text styleId="doc.segment" property="doc.segment" styleClass="form-control"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="config_id" class="col-sm-3 text-sm-right col-form-label">config_id</label>
+                                    <label for="doc.config_id" class="col-sm-3 text-sm-right col-form-label">config_id</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.config_id"/>
-                                        <la:text property="doc.config_id" styleClass="form-control"/>
+                                        <la:text styleId="doc.config_id" property="doc.config_id" styleClass="form-control"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="parent_id" class="col-sm-3 text-sm-right col-form-label">parent_id</label>
+                                    <label for="doc.parent_id" class="col-sm-3 text-sm-right col-form-label">parent_id</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.parent_id"/>
-                                        <la:text property="doc.parent_id" styleClass="form-control"/>
+                                        <la:text styleId="doc.parent_id" property="doc.parent_id" styleClass="form-control"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="content_length" class="col-sm-3 text-sm-right col-form-label">content_length</label>
+                                    <label for="doc.content_length" class="col-sm-3 text-sm-right col-form-label">content_length</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.content_length"/>
-                                        <la:text property="doc.content_length"
+                                        <la:text styleId="doc.content_length"
+                                                 property="doc.content_length"
                                                  styleClass="form-control" title="Integer"
                                                  data-validation="custom" data-validation-regexp="^(\d+)?$"
                                                  data-validation-help="number (Integer)"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="favorite_count" class="col-sm-3 text-sm-right col-form-label">favorite_count</label>
+                                    <label for="doc.favorite_count" class="col-sm-3 text-sm-right col-form-label">favorite_count</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.favorite_count"/>
-                                        <la:text property="doc.favorite_count"
+                                        <la:text styleId="doc.favorite_count"
+                                                 property="doc.favorite_count"
                                                  styleClass="form-control" title="Integer"
                                                  data-validation="custom" data-validation-regexp="^(\d+)?$"
                                                  data-validation-help="number (Integer)"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="click_count" class="col-sm-3 text-sm-right col-form-label">click_count</label>
+                                    <label for="doc.click_count" class="col-sm-3 text-sm-right col-form-label">click_count</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.click_count"/>
-                                        <la:text property="doc.click_count" styleClass="form-control"
+                                        <la:text styleId="doc.click_count"
+                                                 property="doc.click_count" styleClass="form-control"
                                                  title="Integer" data-validation="custom"
                                                  data-validation-regexp="^(\d+)?$"
                                                  data-validation-help="number (Integer)"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="created" class="col-sm-3 text-sm-right col-form-label">created</label>
+                                    <label for="doc.created" class="col-sm-3 text-sm-right col-form-label">created</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.created"/>
-                                        <la:text property="doc.created" styleClass="form-control"
+                                        <la:text styleId="doc.created"
+                                                 property="doc.created" styleClass="form-control"
                                                  title="yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
                                                  data-validation="custom"
                                                  data-validation-regexp="(^$|^[1-9]\d{3}\-\d\d\-\d\dT\d\d\:\d\d\:\d\d\.\d{3}Z$)"
@@ -277,10 +284,11 @@
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="timestamp" class="col-sm-3 text-sm-right col-form-label">timestamp</label>
+                                    <label for="doc.timestamp" class="col-sm-3 text-sm-right col-form-label">timestamp</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.timestamp"/>
-                                        <la:text property="doc.timestamp" styleClass="form-control"
+                                        <la:text styleId="doc.timestamp"
+                                                 property="doc.timestamp" styleClass="form-control"
                                                  title="yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
                                                  data-validation="custom"
                                                  data-validation-regexp="(^$|^[1-9]\d{3}\-\d\d\-\d\dT\d\d\:\d\d\:\d\d\.\d{3}Z$)"
@@ -288,10 +296,11 @@
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="last_modified" class="col-sm-3 text-sm-right col-form-label">last_modified</label>
+                                    <label for="doc.last_modified" class="col-sm-3 text-sm-right col-form-label">last_modified</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.last_modified"/>
-                                        <la:text property="doc.last_modified" styleClass="form-control"
+                                        <la:text styleId="doc.last_modified"
+                                                 property="doc.last_modified" styleClass="form-control"
                                                  title="yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
                                                  data-validation="custom"
                                                  data-validation-regexp="(^$|^[1-9]\d{3}\-\d\d\-\d\dT\d\d\:\d\d\:\d\d\.\d{3}Z$)"
@@ -299,10 +308,11 @@
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="expires" class="col-sm-3 text-sm-right col-form-label">expires</label>
+                                    <label for="doc.expires" class="col-sm-3 text-sm-right col-form-label">expires</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.expires"/>
-                                        <la:text property="doc.expires" styleClass="form-control"
+                                        <la:text styleId="doc.expires"
+                                                 property="doc.expires" styleClass="form-control"
                                                  title="yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
                                                  data-validation="custom"
                                                  data-validation-regexp="(^$|^[1-9]\d{3}\-\d\d\-\d\dT\d\d\:\d\d\:\d\d\.\d{3}Z$)"
@@ -310,10 +320,10 @@
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="virtual_host" class="col-sm-3 text-sm-right col-form-label">virtual_host</label>
+                                    <label for="doc.virtual_host" class="col-sm-3 text-sm-right col-form-label">virtual_host</label>
                                     <div class="col-sm-9">
                                         <la:errors property="doc.virtual_host"/>
-                                        <la:textarea property="doc.virtual_host" styleClass="form-control"/>
+                                        <la:textarea styleId="doc.virtual_host" property="doc.virtual_host" styleClass="form-control"/>
                                     </div>
                                 </div>
                             </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/searchlog/admin_searchlog.jsp b/src/main/webapp/WEB-INF/view/admin/searchlog/admin_searchlog.jsp
index b039043d3..e2215f6b6 100644
--- a/src/main/webapp/WEB-INF/view/admin/searchlog/admin_searchlog.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/searchlog/admin_searchlog.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="searchLog"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/searchlog/admin_searchlog_details.jsp b/src/main/webapp/WEB-INF/view/admin/searchlog/admin_searchlog_details.jsp
index 55b7ce7fd..d996fae35 100644
--- a/src/main/webapp/WEB-INF/view/admin/searchlog/admin_searchlog_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/searchlog/admin_searchlog_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="searchLog"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/storage/admin_storage.jsp b/src/main/webapp/WEB-INF/view/admin/storage/admin_storage.jsp
index 3040c7743..e412f69b0 100644
--- a/src/main/webapp/WEB-INF/view/admin/storage/admin_storage.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/storage/admin_storage.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="storage"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -195,22 +194,20 @@
                                                 <td>
                                                     <c:if test="${not data.directory}">
                                                         <a class="btn btn-primary btn-xs" role="button" name="download"
-                                                           data-toggle="modal"
                                                            href="${contextPath}/admin/storage/download/${f:h(data.id)}/"
-                                                           download="${f:u(data.name)}"
-                                                           value="<la:message key="labels.design_download_button" />"
+                                                           value="<la:message key="labels.storage_button_download" />"
                                                         >
                                                             <em class="fa fa-download"></em>
-                                                            <la:message key="labels.design_download_button"/>
+                                                            <la:message key="labels.storage_button_download"/>
                                                         </a>
                                                         <c:if test="${editable}">
                                                             <button type="button" class="btn btn-danger btn-xs"
                                                                     name="delete" data-toggle="modal"
                                                                     data-target="#confirmToDelete-${f:h(data.hashCode)}"
-                                                                    value="<la:message key="labels.design_delete_button" />"
+                                                                    value="<la:message key="labels.crud_button_delete" />"
                                                             >
                                                                 <em class="fa fa-times"></em>
-                                                                <la:message key="labels.design_delete_button"/>
+                                                                <la:message key="labels.crud_button_delete"/>
                                                             </button>
                                                             <div class="modal fade"
                                                                  id="confirmToDelete-${f:h(data.hashCode)}"
diff --git a/src/main/webapp/WEB-INF/view/admin/systeminfo/admin_systeminfo.jsp b/src/main/webapp/WEB-INF/view/admin/systeminfo/admin_systeminfo.jsp
index eaaa0fe90..7c275d9a6 100644
--- a/src/main/webapp/WEB-INF/view/admin/systeminfo/admin_systeminfo.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/systeminfo/admin_systeminfo.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="systemInfo"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp b/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp
index 8f8998f53..86eab2d83 100644
--- a/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="wizard"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/user/admin_user.jsp b/src/main/webapp/WEB-INF/view/admin/user/admin_user.jsp
index 5f38ddc0e..f99f58938 100644
--- a/src/main/webapp/WEB-INF/view/admin/user/admin_user.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/user/admin_user.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="user"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/user/admin_user_details.jsp b/src/main/webapp/WEB-INF/view/admin/user/admin_user_details.jsp
index 442e0f362..24d751891 100644
--- a/src/main/webapp/WEB-INF/view/admin/user/admin_user_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/user/admin_user_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="user"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/user/admin_user_edit.jsp b/src/main/webapp/WEB-INF/view/admin/user/admin_user_edit.jsp
index 8ce844fdc..c447d9fb7 100644
--- a/src/main/webapp/WEB-INF/view/admin/user/admin_user_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/user/admin_user_edit.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="user"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
@@ -73,7 +72,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="confirm_password" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                    <label for="confirmPassword" class="col-sm-3 text-sm-right col-form-label"><la:message
                                             key="labels.user_confirm_password"/></label>
                                     <div class="col-sm-9">
                                         <la:errors property="confirmPassword"/>
@@ -82,300 +81,300 @@
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="surname" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                    <label for="attributes.surname" class="col-sm-3 text-sm-right col-form-label"><la:message
                                             key="labels.user_surname"/></label>
                                     <div class="col-sm-9">
                                         <la:errors property="attributes.surname"/>
-                                        <la:text property="attributes.surname" styleClass="form-control"/>
+                                        <la:text styleId="attributes.surname" property="attributes.surname" styleClass="form-control"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="givenName" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                    <label for="attributes.givenName" class="col-sm-3 text-sm-right col-form-label"><la:message
                                             key="labels.user_given_name"/></label>
                                     <div class="col-sm-9">
                                         <la:errors property="attributes.givenName"/>
-                                        <la:text property="attributes.givenName" styleClass="form-control"/>
+                                        <la:text styleId="attributes.givenName" property="attributes.givenName" styleClass="form-control"/>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="mail" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                    <label for="attributes.mail" class="col-sm-3 text-sm-right col-form-label"><la:message
                                             key="labels.user_mail"/></label>
                                     <div class="col-sm-9">
                                         <la:errors property="attributes.mail"/>
-                                        <la:text property="attributes.mail" styleClass="form-control"/>
+                                        <la:text styleId="attributes.mail" property="attributes.mail" styleClass="form-control"/>
                                     </div>
                                 </div>
                                 <c:if test="${ldapAdminEnabled}">
                                     <div class="form-group row">
-                                        <label for="employeeNumber" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.employeeNumber" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_employeeNumber"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.employeeNumber"/>
-                                            <la:text property="attributes.employeeNumber" styleClass="form-control"/>
+                                            <la:text styleId="attributes.employeeNumber" property="attributes.employeeNumber" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="telephoneNumber" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.telephoneNumber" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_telephoneNumber"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.telephoneNumber"/>
-                                            <la:text property="attributes.telephoneNumber" styleClass="form-control"/>
+                                            <la:text styleId="attributes.telephoneNumber" property="attributes.telephoneNumber" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="homePhone" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.homePhone" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_homePhone"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.homePhone"/>
-                                            <la:text property="attributes.homePhone" styleClass="form-control"/>
+                                            <la:text styleId="attributes.homePhone" property="attributes.homePhone" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="homePostalAddress" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.homePostalAddress" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_homePostalAddress"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.homePostalAddress"/>
-                                            <la:text property="attributes.homePostalAddress" styleClass="form-control"/>
+                                            <la:text styleId="attributes.homePostalAddress" property="attributes.homePostalAddress" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="labeledURI" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.labeledURI" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_labeledURI"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.labeledURI"/>
-                                            <la:text property="attributes.labeledURI" styleClass="form-control"/>
+                                            <la:text styleId="attributes.labeledURI" property="attributes.labeledURI" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="roomNumber" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.roomNumber" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_roomNumber"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.roomNumber"/>
-                                            <la:text property="attributes.roomNumber" styleClass="form-control"/>
+                                            <la:text styleId="attributes.roomNumber" property="attributes.roomNumber" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="description" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.description" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_description"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.description"/>
-                                            <la:text property="attributes.description" styleClass="form-control"/>
+                                            <la:text styleId="attributes.description" property="attributes.description" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="title" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.title" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_title"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.title"/>
-                                            <la:text property="attributes.title" styleClass="form-control"/>
+                                            <la:text styleId="attributes.title" property="attributes.title" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="pager" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.pager" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_pager"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.pager"/>
-                                            <la:text property="attributes.pager" styleClass="form-control"/>
+                                            <la:text styleId="attributes.pager" property="attributes.pager" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="street" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.street" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_street"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.street"/>
-                                            <la:text property="attributes.street" styleClass="form-control"/>
+                                            <la:text styleId="attributes.street"  property="attributes.street" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="postalCode" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.postalCode" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_postalCode"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.postalCode"/>
-                                            <la:text property="attributes.postalCode" styleClass="form-control"/>
+                                            <la:text styleId="attributes.postalCode" property="attributes.postalCode" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="physicalDeliveryOfficeName"
+                                        <label for="attributes.physicalDeliveryOfficeName"
                                                class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_physicalDeliveryOfficeName"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.physicalDeliveryOfficeName"/>
-                                            <la:text property="attributes.physicalDeliveryOfficeName"
+                                            <la:text styleId="attributes.physicalDeliveryOfficeName" property="attributes.physicalDeliveryOfficeName"
                                                      styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="destinationIndicator" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.destinationIndicator" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_destinationIndicator"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.destinationIndicator"/>
-                                            <la:text property="attributes.destinationIndicator"
+                                            <la:text styleId="attributes.destinationIndicator" property="attributes.destinationIndicator"
                                                      styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="internationaliSDNNumber" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.internationaliSDNNumber" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_internationaliSDNNumber"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.internationaliSDNNumber"/>
-                                            <la:text property="attributes.internationaliSDNNumber"
+                                            <la:text styleId="attributes.internationaliSDNNumber" property="attributes.internationaliSDNNumber"
                                                      styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="state" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.state" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_state"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.state"/>
-                                            <la:text property="attributes.state" styleClass="form-control"/>
+                                            <la:text styleId="attributes.state" property="attributes.state" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="employeeType" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.employeeType" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_employeeType"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.employeeType"/>
-                                            <la:text property="attributes.employeeType" styleClass="form-control"/>
+                                            <la:text styleId="attributes.employeeType" property="attributes.employeeType" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="facsimileTelephoneNumber"
+                                        <label for="attributes.facsimileTelephoneNumber"
                                                class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_facsimileTelephoneNumber"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.facsimileTelephoneNumber"/>
-                                            <la:text property="attributes.facsimileTelephoneNumber"
+                                            <la:text styleId="attributes.facsimileTelephoneNumber" property="attributes.facsimileTelephoneNumber"
                                                      styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="postOfficeBox" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.postOfficeBox" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_postOfficeBox"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.postOfficeBox"/>
-                                            <la:text property="attributes.postOfficeBox" styleClass="form-control"/>
+                                            <la:text styleId="attributes.postOfficeBox" property="attributes.postOfficeBox" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="initials" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.initials" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_initials"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.initials"/>
-                                            <la:text property="attributes.initials" styleClass="form-control"/>
+                                            <la:text styleId="attributes.initials" property="attributes.initials" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="carLicense" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.carLicense" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_carLicense"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.carLicense"/>
-                                            <la:text property="attributes.carLicense" styleClass="form-control"/>
+                                            <la:text styleId="attributes.carLicense" property="attributes.carLicense" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="mobile" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.mobile" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_mobile"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.mobile"/>
-                                            <la:text property="attributes.mobile" styleClass="form-control"/>
+                                            <la:text styleId="attributes.mobile" property="attributes.mobile" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="postalAddress" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.postalAddress" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_postalAddress"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.postalAddress"/>
-                                            <la:text property="attributes.postalAddress" styleClass="form-control"/>
+                                            <la:text styleId="attributes.postalAddress" property="attributes.postalAddress" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="city" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.city" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_city"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.city"/>
-                                            <la:text property="attributes.city" styleClass="form-control"/>
+                                            <la:text styleId="attributes.city" property="attributes.city" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="teletexTerminalIdentifier"
+                                        <label for="attributes.teletexTerminalIdentifier"
                                                class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_teletexTerminalIdentifier"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.teletexTerminalIdentifier"/>
-                                            <la:text property="attributes.teletexTerminalIdentifier"
+                                            <la:text styleId="attributes.teletexTerminalIdentifier" property="attributes.teletexTerminalIdentifier"
                                                      styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="x121Address" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.x121Address" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_x121Address"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.x121Address"/>
-                                            <la:text property="attributes.x121Address" styleClass="form-control"/>
+                                            <la:text styleId="attributes.x121Address" property="attributes.x121Address" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="businessCategory" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.businessCategory" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_businessCategory"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.businessCategory"/>
-                                            <la:text property="attributes.businessCategory" styleClass="form-control"/>
+                                            <la:text styleId="attributes.businessCategory" property="attributes.businessCategory" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="registeredAddress" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.registeredAddress" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_registeredAddress"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.registeredAddress"/>
-                                            <la:text property="attributes.registeredAddress" styleClass="form-control"/>
+                                            <la:text styleId="attributes.registeredAddress" property="attributes.registeredAddress" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="displayName" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.displayName" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_displayName"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.displayName"/>
-                                            <la:text property="attributes.displayName" styleClass="form-control"/>
+                                            <la:text styleId="attributes.displayName" property="attributes.displayName" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="preferredLanguage" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.preferredLanguage" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_preferredLanguage"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.preferredLanguage"/>
-                                            <la:text property="attributes.preferredLanguage" styleClass="form-control"/>
+                                            <la:text styleId="attributes.preferredLanguage" property="attributes.preferredLanguage" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="departmentNumber" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.departmentNumber" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_departmentNumber"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.departmentNumber"/>
-                                            <la:text property="attributes.departmentNumber" styleClass="form-control"/>
+                                            <la:text styleId="attributes.departmentNumber" property="attributes.departmentNumber" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="uidNumber" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.uidNumber" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_uidNumber"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.uidNumber"/>
-                                            <la:text property="attributes.uidNumber" styleClass="form-control"/>
+                                            <la:text styleId="attributes.uidNumber" property="attributes.uidNumber" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="gidNumber" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.gidNumber" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_gidNumber"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.gidNumber"/>
-                                            <la:text property="attributes.gidNumber" styleClass="form-control"/>
+                                            <la:text styleId="attributes.gidNumber" property="attributes.gidNumber" styleClass="form-control"/>
                                         </div>
                                     </div>
                                     <div class="form-group row">
-                                        <label for="homeDirectory" class="col-sm-3 text-sm-right col-form-label"><la:message
+                                        <label for="attributes.homeDirectory" class="col-sm-3 text-sm-right col-form-label"><la:message
                                                 key="labels.user_homeDirectory"/></label>
                                         <div class="col-sm-9">
                                             <la:errors property="attributes.homeDirectory"/>
-                                            <la:text property="attributes.homeDirectory" styleClass="form-control"/>
+                                            <la:text styleId="attributes.homeDirectory" property="attributes.homeDirectory" styleClass="form-control"/>
                                         </div>
                                     </div>
                                 </c:if>
diff --git a/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth.jsp b/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth.jsp
index e4807aaac..41100fa5b 100644
--- a/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="webAuthentication"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth_details.jsp b/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth_details.jsp
index ef82aca78..a46b501cb 100644
--- a/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="webAuthentication"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth_edit.jsp b/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth_edit.jsp
index 6b8da40b2..6e63412fa 100644
--- a/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth_edit.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="webAuthentication"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_details.jsp b/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_details.jsp
index 4a375004b..51ad8aefd 100644
--- a/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_details.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="webConfig"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_edit.jsp b/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_edit.jsp
index 40b28d417..1062bbb19 100644
--- a/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_edit.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="webConfig"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard.jsp b/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard.jsp
index dc35943cc..7bd739407 100644
--- a/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="wizard"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard_config.jsp b/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard_config.jsp
index aa10242ef..86e28a79a 100644
--- a/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard_config.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard_config.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="wizard"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard_start.jsp b/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard_start.jsp
index 8425a90c5..00b40116e 100644
--- a/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard_start.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard_start.jsp
@@ -14,7 +14,6 @@
         <jsp:param name="menuType" value="wizard"/>
     </jsp:include>
     <div class="content-wrapper">
-
         <div class="content-header">
             <div class="container-fluid">
                 <div class="row mb-2">
diff --git a/src/main/webapp/css/admin/style.css b/src/main/webapp/css/admin/style.css
index e8c0c0b0f..75a10be47 100644
--- a/src/main/webapp/css/admin/style.css
+++ b/src/main/webapp/css/admin/style.css
@@ -22,11 +22,6 @@
 	margin-top: 3.0em;
 }
 
-.logo-lg img {
-	width: 50%;
-	height: 50%;
-}
-
 .container .text-muted {
 	margin: 20px 0;
 }