diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/Article.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/Article.tsx
index d64c60b..464e925 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/Article.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/Article.tsx
@@ -14,8 +14,8 @@ import ShowCategories from './ShowCategories';
 import ShowArticleAction from './ShowArticleAction';
 import { toastr } from 'react-redux-toastr';
 import { IncludeActionWithFile, ActionFile } from '../models/Article';
+import WaitPanel from './common/WaitPanel';
 
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
 const editPng: string = require('../theme/newspaper/img/edit.png');
 const deletePng: string = require('../theme/newspaper/img/delete.png');
 
@@ -369,9 +369,7 @@ class Article extends React.Component<ArticleProps, {}> {
 
                     <Header />
 
-                    <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                        <img src={waitGif} ></img>
-                    </div>
+                    <WaitPanel isContentReady={this.contentReady} />
 
                     <div className="container open-line"></div>
 
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/ArticleCategory.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/ArticleCategory.tsx
index f8449aa..418676b 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/ArticleCategory.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/ArticleCategory.tsx
@@ -10,8 +10,7 @@ import Footer from './footer/Footer';
 import Header from './header/Header';
 import { ArticleModel } from 'ClientApp/models/Article';
 import ShowArticle from './ShowArticle';
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type ArticleCategoryProps =
     AccountStore.AccountState
@@ -100,9 +99,7 @@ class ArticleCategory extends React.Component<ArticleCategoryProps, {}> {
 
                     <Header />
 
-                    <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                        <img src={waitGif} ></img>
-                    </div>
+                    <WaitPanel isContentReady={this.contentReady} />
 
                     <div className="container open-line"></div>
 
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/ArticleList.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/ArticleList.tsx
index a908de1..8711217 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/ArticleList.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/ArticleList.tsx
@@ -9,8 +9,7 @@ import ErrorMsg from '../message/errormsg';
 import Footer from './footer/Footer';
 import Header from './header/Header';
 import ShowArticle from './ShowArticle';
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type ArticleListProps =
     AccountStore.AccountState
@@ -78,9 +77,7 @@ class ArticleList extends React.Component<ArticleListProps, {}> {
 
                 <Header />
 
-                <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                    <img src={waitGif} ></img>
-                </div>
+                <WaitPanel isContentReady={this.contentReady} />
 
                 <div className="container open-line"></div>
 
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListApproval.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListApproval.tsx
index 2ff6dfd..16a263c 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListApproval.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListApproval.tsx
@@ -10,8 +10,7 @@ import ErrorMsg from '../message/errormsg';
 import Footer from './footer/Footer';
 import Header from './header/Header';
 import ShowArticleRef from './ShowArticleRef';
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type ArticleListApprovalProps =
     AccountStore.AccountState
@@ -90,9 +89,7 @@ class ArticleListApproval extends React.Component<ArticleListApprovalProps, {}>
 
                 <Header />
 
-                <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                    <img src={waitGif} ></img>
-                </div>
+                <WaitPanel isContentReady={this.contentReady} />
 
                 <div className="container open-line"></div>
 
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListNarration.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListNarration.tsx
index 70d2490..adc9ac8 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListNarration.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListNarration.tsx
@@ -11,8 +11,7 @@ import Header from './header/Header';
 import ShowArticle from './ShowArticle';
 import ShowArticleRef from './ShowArticleRef';
 import { routerActions } from 'react-router-redux';
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type ArticleListNarrationProps =
     AccountStore.AccountState
@@ -97,9 +96,7 @@ class ArticleListNarration extends React.Component<ArticleListNarrationProps, {}
 
                 <Header />
 
-                <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                    <img src={waitGif} ></img>
-                </div>
+                <WaitPanel isContentReady={this.contentReady} />
 
                 <div className="container open-line"></div>
 
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListProduction.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListProduction.tsx
index f10d1cd..bebc5cc 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListProduction.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListProduction.tsx
@@ -11,8 +11,7 @@ import Header from './header/Header';
 import ShowArticle from './ShowArticle';
 import ShowArticleRef from './ShowArticleRef';
 import { routerActions } from 'react-router-redux';
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type ArticleListProductionProps =
     AccountStore.AccountState
@@ -97,9 +96,7 @@ class ArticleListProduction extends React.Component<ArticleListProductionProps,
 
                 <Header />
 
-                <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                    <img src={waitGif} ></img>
-                </div>
+                <WaitPanel isContentReady={this.contentReady} />
 
                 <div className="container open-line"></div>
 
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListPublish.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListPublish.tsx
index 2b0e515..3569716 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListPublish.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListPublish.tsx
@@ -11,8 +11,7 @@ import Header from './header/Header';
 import ShowArticle from './ShowArticle';
 import ShowArticleRef from './ShowArticleRef';
 import { routerActions } from 'react-router-redux';
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type ArticleListPublishProps =
     AccountStore.AccountState
@@ -101,9 +100,7 @@ class ArticleListPublish extends React.Component<ArticleListPublishProps, {}> {
 
                     <Header />
 
-                    <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                        <img src={waitGif} ></img>
-                    </div>
+                    <WaitPanel isContentReady={this.contentReady} />
 
                     <div className="container open-line"></div>
 
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListRevision.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListRevision.tsx
index c25f5fb..0377d60 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListRevision.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListRevision.tsx
@@ -11,8 +11,7 @@ import Header from './header/Header';
 import ShowArticle from './ShowArticle';
 import ShowArticleRef from './ShowArticleRef';
 import { routerActions } from 'react-router-redux';
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type ArticleListRevisionProps =
     AccountStore.AccountState
@@ -97,9 +96,7 @@ class ArticleListRevision extends React.Component<ArticleListRevisionProps, {}>
 
                 <Header />
 
-                <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                    <img src={waitGif} ></img>
-                </div>
+                <WaitPanel isContentReady={this.contentReady} />
 
                 <div className="container open-line"></div>
 
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListTranslation.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListTranslation.tsx
index 7aa29c4..16a9886 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListTranslation.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/ArticleListTranslation.tsx
@@ -11,8 +11,8 @@ import Header from './header/Header';
 import ShowArticle from './ShowArticle';
 import ShowArticleRef from './ShowArticleRef';
 import { routerActions } from 'react-router-redux';
+import WaitPanel from './common/WaitPanel';
 
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
 
 type ArticleListTranslationProps =
     AccountStore.AccountState
@@ -97,9 +97,7 @@ class ArticleListTranslation extends React.Component<ArticleListTranslationProps
 
                 <Header />
 
-                <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                    <img src={waitGif} ></img>
-                </div>
+                <WaitPanel isContentReady={this.contentReady} />
 
                 <div className="container open-line"></div>
 
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/EditArticleForm.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/EditArticleForm.tsx
index 11ba88c..e8b1fa0 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/EditArticleForm.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/EditArticleForm.tsx
@@ -12,8 +12,7 @@ import * as ArticleModel from '../models/Article';
 import * as ArticleStore from '../store/Article';
 import { routerActions } from 'react-router-redux';
 import * as Toastr from 'react-redux-toastr'
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type EditArticleBaseProps =
     AccountStore.AccountState
@@ -294,9 +293,7 @@ class EditArticleForm extends React.Component<InjectedEditArticleFormProps, {}>
 
                     <div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">
 
-                        <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                            <img src={waitGif} ></img>
-                        </div>
+                        <WaitPanel isContentReady={this.contentReady} />
 
                         <div className="wpb_wrapper">
                             <div className="td-pb-border-top">
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/EditTargetForm.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/EditTargetForm.tsx
index 71668be..c4cb5eb 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/EditTargetForm.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/EditTargetForm.tsx
@@ -13,8 +13,7 @@ import * as NewsModel from '../models/News';
 import { ChangeTargetModel } from '../models/Target';
 import { routerActions } from 'react-router-redux';
 import * as Toastr from 'react-redux-toastr'
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type EditTargetBaseProps =
     AccountStore.AccountState
@@ -207,9 +206,7 @@ class EditTargetForm extends React.Component<InjectedEditTargetFormProps, {}> {
 
                     <div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">
 
-                        <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                            <img src={waitGif} ></img>
-                        </div>
+                        <WaitPanel isContentReady={this.contentReady} />
 
                         <div className="wpb_wrapper">
                             <div className="td-pb-border-top">
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/EditVideoForm.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/EditVideoForm.tsx
index 7db2f6d..9d6c98e 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/EditVideoForm.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/EditVideoForm.tsx
@@ -12,8 +12,7 @@ import * as VideoModel from '../models/Video';
 import * as VideoStore from '../store/Video';
 import { routerActions } from 'react-router-redux';
 import * as Toastr from 'react-redux-toastr'
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type EditVideoBaseProps =
     AccountStore.AccountState
@@ -205,9 +204,7 @@ class EditVideoForm extends React.Component<InjectedEditVideoFormProps, {}> {
 
                     <div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">
 
-                        <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                            <img src={waitGif} ></img>
-                        </div>
+                        <WaitPanel isContentReady={this.contentReady} />
 
                         <div className="wpb_wrapper">
                             <div className="td-pb-border-top">
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/ManageUserForm.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/ManageUserForm.tsx
index aee57f6..6afb474 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/ManageUserForm.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/ManageUserForm.tsx
@@ -10,8 +10,7 @@ import * as AccountStore from '../store/Account';
 import * as AccountModel from '../models/Account';
 import { routerActions } from 'react-router-redux';
 import * as Toastr from 'react-redux-toastr'
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type ManageUserBaseProps =
     AccountStore.AccountState
@@ -122,9 +121,7 @@ class ManageUserForm extends React.Component<InjectedManageUserFormProps, {}> {
 
                         <div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">
 
-                            <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                                <img src={waitGif} ></img>
-                            </div>
+                            <WaitPanel isContentReady={this.contentReady} />
 
                             <div className="wpb_wrapper">
                                 <div className="td-pb-border-top">
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/ManageUsersForm.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/ManageUsersForm.tsx
index cc51f63..3a788c8 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/ManageUsersForm.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/ManageUsersForm.tsx
@@ -15,8 +15,7 @@ import { SearchArticleModel } from 'ClientApp/models/Article';
 import ShowArticleRef from './ShowArticleRef';
 import { SearchUserModel } from 'ClientApp/models/Account';
 import ShowUserRef from './ShowUserRef';
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type ManageUserBaseProps =
     AccountStore.AccountState
@@ -173,9 +172,7 @@ class ManageUsersForm extends React.Component<InjectedSearchUserFormProps, {}> {
 
                     <div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">
 
-                        <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                            <img src={waitGif} ></img>
-                        </div>
+                        <WaitPanel isContentReady={this.contentReady} />
 
                         <div className="wpb_wrapper">
                             <div className="td-pb-border-top">
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/NewArticleForm.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/NewArticleForm.tsx
index a02e8a8..5dc16e7 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/NewArticleForm.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/NewArticleForm.tsx
@@ -12,8 +12,7 @@ import * as ArticleModel from '../models/Article';
 import * as ArticleStore from '../store/Article';
 import { routerActions } from 'react-router-redux';
 import * as Toastr from 'react-redux-toastr'
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type NewArticleBaseProps =
     AccountStore.AccountState
@@ -337,9 +336,7 @@ class NewArticleForm extends React.Component<InjectedNewArticleFormProps, {}> {
 
                     <div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">
 
-                        <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                            <img src={waitGif} ></img>
-                        </div>
+                        <WaitPanel isContentReady={this.contentReady} />
 
                         <div className="wpb_wrapper">
                             <div className="td-pb-border-top">
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/NewTargetForm.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/NewTargetForm.tsx
index 0abb3e2..47b5273 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/NewTargetForm.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/NewTargetForm.tsx
@@ -11,8 +11,7 @@ import * as TargetStore from '../store/Target';
 import { NewTargetModel } from '../models/Target';
 import { routerActions } from 'react-router-redux';
 import * as Toastr from 'react-redux-toastr'
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type NewTargetBaseProps =
     AccountStore.AccountState
@@ -248,9 +247,7 @@ class NewTargetForm extends React.Component<InjectedNewTargetFormProps, {}> {
 
                     <div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">
 
-                        <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                            <img src={waitGif} ></img>
-                        </div>
+                        <WaitPanel isContentReady={this.contentReady} />
 
                         <div className="wpb_wrapper">
                             <div className="td-pb-border-top">
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/NewVideoForm.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/NewVideoForm.tsx
index 85ec6c5..30932f7 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/NewVideoForm.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/NewVideoForm.tsx
@@ -11,8 +11,7 @@ import * as VideoStore from '../store/Video';
 import { NewVideoModel } from '../models/Video';
 import { routerActions } from 'react-router-redux';
 import * as Toastr from 'react-redux-toastr'
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type NewVideoBaseProps =
     AccountStore.AccountState
@@ -227,9 +226,7 @@ class NewVideoForm extends React.Component<InjectedNewVideoFormProps, {}> {
 
                     <div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">
 
-                        <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                            <img src={waitGif} ></img>
-                        </div>
+                        <WaitPanel isContentReady={this.contentReady} />
 
                         <div className="wpb_wrapper">
                             <div className="td-pb-border-top">
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/SearchArticleForm.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/SearchArticleForm.tsx
index 7ff76f4..76e41a4 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/SearchArticleForm.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/SearchArticleForm.tsx
@@ -13,8 +13,7 @@ import { routerActions } from 'react-router-redux';
 import * as Toastr from 'react-redux-toastr'
 import { SearchArticleModel } from 'ClientApp/models/Article';
 import ShowArticleRef from './ShowArticleRef';
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type SearchArticleBaseProps =
     AccountStore.AccountState
@@ -175,9 +174,7 @@ class SearchArticleForm extends React.Component<InjectedSearchArticleFormProps,
 
                     <div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">
 
-                        <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                            <img src={waitGif} ></img>
-                        </div>
+                        <WaitPanel isContentReady={this.contentReady} />
 
                         <div className="wpb_wrapper">
                             <div className="td-pb-border-top">
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/SearchTargetForm.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/SearchTargetForm.tsx
index 517d5b1..c420138 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/SearchTargetForm.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/SearchTargetForm.tsx
@@ -12,8 +12,7 @@ import { NewTargetModel, SearchTargetModel } from '../models/Target';
 import { routerActions } from 'react-router-redux';
 import * as Toastr from 'react-redux-toastr'
 import ShowTargetRef from './ShowTargetRef';
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type SearchTargetBaseProps =
     AccountStore.AccountState
@@ -174,9 +173,7 @@ class SearchTargetForm extends React.Component<InjectedSearchTargetFormProps, {}
 
                     <div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">
 
-                        <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                            <img src={waitGif} ></img>
-                        </div>
+                        <WaitPanel isContentReady={this.contentReady} />
 
                         <div className="wpb_wrapper">
                             <div className="td-pb-border-top">
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/SearchVideoForm.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/SearchVideoForm.tsx
index 19252f1..1d1f85f 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/SearchVideoForm.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/SearchVideoForm.tsx
@@ -12,8 +12,8 @@ import { SearchVideoModel } from '../models/Video';
 import { routerActions } from 'react-router-redux';
 import * as Toastr from 'react-redux-toastr'
 import ShowVideo from './ShowVideo';
+import WaitPanel from './common/WaitPanel';
 
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
 
 type SearchVideoBaseProps =
     AccountStore.AccountState
@@ -174,9 +174,7 @@ class SearchVideoForm extends React.Component<InjectedSearchVideoFormProps, {}>
 
                     <div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">
 
-                        <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                            <img src={waitGif} ></img>
-                        </div>
+                        <WaitPanel isContentReady={this.contentReady} />
 
                         <div className="wpb_wrapper">
                             <div className="td-pb-border-top">
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/Target.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/Target.tsx
index 6f9332c..b453430 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/Target.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/Target.tsx
@@ -11,8 +11,7 @@ import Header from './header/Header';
 import ShowAuthors from './ShowAuthors';
 import ShowCategories from './ShowCategories';
 import ShowTargetAction from './ShowTargetAction';
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type TargetProps =
     AccountStore.AccountState
@@ -90,9 +89,7 @@ class Target extends React.Component<TargetProps, {}> {
 
                     <Header />
 
-                    <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                        <img src={waitGif} ></img>
-                    </div>
+                    <WaitPanel isContentReady={this.contentReady} />
 
                     <div className="container open-line"></div>
 
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/TargetCategory.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/TargetCategory.tsx
index 0ba7609..456f8e7 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/TargetCategory.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/TargetCategory.tsx
@@ -9,8 +9,7 @@ import ErrorMsg from '../message/errormsg';
 import Footer from './footer/Footer';
 import Header from './header/Header';
 import ShowTargetRef from './ShowTargetRef';
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type TargetCategoryProps =
     AccountStore.AccountState
@@ -95,9 +94,7 @@ class TargetCategory extends React.Component<TargetCategoryProps, {}> {
 
                 <Header />
 
-                <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                    <img src={waitGif} ></img>
-                </div>
+                <WaitPanel isContentReady={this.contentReady} />
 
                 <div className="container open-line"></div>
 
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/TargetList.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/TargetList.tsx
index 12b821f..49b29ba 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/TargetList.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/TargetList.tsx
@@ -11,8 +11,7 @@ import Footer from './footer/Footer';
 import Header from './header/Header';
 import ShowTargetRef from './ShowTargetRef';
 import Layout from './Layout';
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type TargetListProps =
     AccountStore.AccountState
@@ -81,9 +80,7 @@ class TargetList extends React.Component<TargetListProps, {}> {
 
                 <Header />
 
-                <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                    <img src={waitGif} ></img>
-                </div>
+                <WaitPanel isContentReady={this.contentReady} />
 
                 <div className="container open-line"></div>
 
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/TargetListAll.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/TargetListAll.tsx
index 58c37ae..65ecd48 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/TargetListAll.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/TargetListAll.tsx
@@ -10,8 +10,7 @@ import ErrorMsg from '../message/errormsg';
 import Footer from './footer/Footer';
 import Header from './header/Header';
 import ShowTargetRef from './ShowTargetRef';
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type TargetListAllProps =
     AccountStore.AccountState
@@ -71,9 +70,7 @@ class TargetListAll extends React.Component<TargetListAllProps, {}> {
 
                 <Header />
 
-                <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                    <img src={waitGif} ></img>
-                </div>
+                <WaitPanel isContentReady={this.contentReady} />
 
                 <div className="container open-line"></div>
 
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/TranslateArticleForm.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/TranslateArticleForm.tsx
index 964959f..383de8b 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/TranslateArticleForm.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/TranslateArticleForm.tsx
@@ -12,8 +12,7 @@ import * as ArticleModel from '../models/Article';
 import * as ArticleStore from '../store/Article';
 import { routerActions } from 'react-router-redux';
 import * as Toastr from 'react-redux-toastr'
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type TranslateArticleBaseProps =
     AccountStore.AccountState
@@ -289,9 +288,7 @@ class TranslateArticleForm extends React.Component<InjectedTranslateArticleFormP
 
                     <div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">
 
-                        <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                            <img src={waitGif} ></img>
-                        </div>
+                        <WaitPanel isContentReady={this.contentReady} />
 
                         <div className="wpb_wrapper">
                             <div className="td-pb-border-top">
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/ValueDescription.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/ValueDescription.tsx
index 816b699..04cb0b6 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/ValueDescription.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/ValueDescription.tsx
@@ -9,8 +9,7 @@ import ErrorMsg from '../message/errormsg';
 import Footer from './footer/Footer';
 import Header from './header/Header';
 import { routerActions } from 'react-router-redux';
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type ValueDescriptionProps =
     AccountStore.AccountState
@@ -86,9 +85,7 @@ class ValueDescription extends React.Component<ValueDescriptionProps, {}> {
 
                     <Header />
 
-                    <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                        <img src={waitGif} ></img>
-                    </div>
+                    <WaitPanel isContentReady={this.contentReady} />
 
                     <div className="container open-line"></div>
 
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/Video.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/Video.tsx
index f2a561e..2fcacec 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/Video.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/Video.tsx
@@ -10,8 +10,7 @@ import Footer from './footer/Footer';
 import Header from './header/Header';
 import ShowAuthors from './ShowAuthors';
 import ShowCategories from './ShowCategories';
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type VideoProps =
     AccountStore.AccountState
@@ -89,9 +88,7 @@ class Video extends React.Component<VideoProps, {}> {
 
                     <Header />
 
-                    <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                        <img src={waitGif} ></img>
-                    </div>
+                    <WaitPanel isContentReady={this.contentReady} />
 
                     <div className="container open-line"></div>
 
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/VideoCategory.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/VideoCategory.tsx
index 76703cc..57914bc 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/VideoCategory.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/VideoCategory.tsx
@@ -9,8 +9,7 @@ import ErrorMsg from '../message/errormsg';
 import Footer from './footer/Footer';
 import Header from './header/Header';
 import ShowVideo from './ShowVideo';
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type VideoCategoryProps =
     AccountStore.AccountState
@@ -99,9 +98,7 @@ class VideoCategory extends React.Component<VideoCategoryProps, {}> {
 
                     <Header />
 
-                    <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                        <img src={waitGif} ></img>
-                    </div>
+                    <WaitPanel isContentReady={this.contentReady} />
 
                     <div className="container open-line"></div>
 
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/VideoList.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/VideoList.tsx
index e6cd115..13f53c4 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/VideoList.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/VideoList.tsx
@@ -9,8 +9,7 @@ import ErrorMsg from '../message/errormsg';
 import Footer from './footer/Footer';
 import Header from './header/Header';
 import ShowVideo from './ShowVideo';
-
-const waitGif: string = require('../theme/newspaper/img/wait.gif');
+import WaitPanel from './common/WaitPanel';
 
 type VideoListProps =
     AccountStore.AccountState
@@ -82,9 +81,7 @@ class VideoList extends React.Component<VideoListProps, {}> {
 
                     <Header />
 
-                    <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                        <img src={waitGif} ></img>
-                    </div>
+                    <WaitPanel isContentReady={this.contentReady} />
 
                     <div className="container open-line"></div>
 
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/account/ChangePasswordForm.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/account/ChangePasswordForm.tsx
index bb1ae85..616e92f 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/account/ChangePasswordForm.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/account/ChangePasswordForm.tsx
@@ -8,8 +8,8 @@ import RacMsg from '../../message/racmsg';
 import * as AccountStore from '../../store/Account';
 import * as AccountModel from '../../models/Account';
 import { toastr } from 'react-redux-toastr';
+import WaitPanel from '../common/WaitPanel';
 
-const waitGif: string = require('../../theme/newspaper/img/wait.gif');
 
 type ChangePasswordBaseProps =
     AccountStore.AccountState
@@ -113,9 +113,7 @@ class ChangePasswordForm extends React.Component<InjectedChangePasswordFormProps
                     </span>
                 </div>
 
-                <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                    <img src={waitGif} ></img>
-                </div>
+                <WaitPanel isContentReady={this.contentReady} />
 
                 <form role="form" onSubmit={this.props.handleSubmit(this.handleSubmitForm)}>
                     
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/account/ConfirmEmailForm.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/account/ConfirmEmailForm.tsx
index f61773f..2c4b584 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/account/ConfirmEmailForm.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/account/ConfirmEmailForm.tsx
@@ -9,8 +9,7 @@ import * as AccountStore from '../../store/Account';
 import * as AccountModel from '../../models/Account';
 import * as Verify from '../../message/verify';
 import { toastr } from 'react-redux-toastr';
-
-const waitGif: string = require('../../theme/newspaper/img/wait.gif');
+import WaitPanel from '../common/WaitPanel';
 
 type ConfirmEmailBaseProps =
     AccountStore.AccountState
@@ -235,9 +234,7 @@ class ConfirmEmailForm extends React.Component<InjectedConfirmEmailFormProps, {}
                             </span>
                         </div>
 
-                        <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                            <img src={waitGif} ></img>
-                        </div>
+                        <WaitPanel isContentReady={this.contentReady} />
 
                         <div className="form-group">
                             <Field name="Email" component='input' type="email" className="form-control" id="Email" onChange={this.changeEmail} placeholder={RacMsg.Get(RacMsg.Id.EnterYourEmail)} />
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/account/CreateAccountForm.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/account/CreateAccountForm.tsx
index df774b2..b625a9e 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/account/CreateAccountForm.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/account/CreateAccountForm.tsx
@@ -9,8 +9,7 @@ import * as AccountStore from '../../store/Account';
 import * as AccountModel from '../../models/Account';
 import { toastr } from 'react-redux-toastr';
 import * as Verify from '../../message/verify';
-
-const waitGif: string = require('../../theme/newspaper/img/wait.gif');
+import WaitPanel from '../common/WaitPanel';
 
 type CreateAccountBaseProps =
     AccountStore.AccountState
@@ -157,9 +156,7 @@ class CreateAccountForm extends React.Component<InjectedCreateAccountFormProps,
                     </span>
                 </div>
 
-                <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                    <img src={waitGif} ></img>
-                </div>
+                <WaitPanel isContentReady={this.contentReady} />
 
                 <form id="captcha-form" role="form" onSubmit={this.props.handleSubmit(this.handleSubmitForm)}>
                                                 
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/account/EditProfileForm.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/account/EditProfileForm.tsx
index 14824ec..d8ff8b1 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/account/EditProfileForm.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/account/EditProfileForm.tsx
@@ -12,8 +12,8 @@ import * as AccountModel from '../../models/Account';
 import { routerActions } from 'react-router-redux';
 import * as Verify from '../../message/verify';
 import { toastr } from 'react-redux-toastr';
+import WaitPanel from '../common/WaitPanel';
 
-const waitGif: string = require('../../theme/newspaper/img/wait.gif');
 const defaultProfile: string = require('../../theme/newspaper/img/defaultprofile.png');
 
 type EditProfileBaseProps =
@@ -173,9 +173,7 @@ class EditProfileForm extends React.Component<InjectedEditProfileFormProps, {}>
 
                 <form role="form" onSubmit={this.props.handleSubmit(this.handleSubmitForm)}>
 
-                    <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                        <img src={waitGif} ></img>
-                    </div>
+                    <WaitPanel isContentReady={this.contentReady} />
 
                     <div className="vc_column wpb_column vc_column_container tdc-column td-pb-span4">
 
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/account/ForgotPasswordForm.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/account/ForgotPasswordForm.tsx
index 821ccb3..f28d0d6 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/account/ForgotPasswordForm.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/account/ForgotPasswordForm.tsx
@@ -8,9 +8,9 @@ import RacMsg from '../../message/racmsg';
 import * as AccountStore from '../../store/Account';
 import * as AccountModel from '../../models/Account';
 import * as Verify from '../../message/verify';
+import WaitPanel from '../common/WaitPanel';
 import { toastr } from 'react-redux-toastr';
 
-const waitGif: string = require('../../theme/newspaper/img/wait.gif');
 
 type ForgotPasswordBaseProps =
     AccountStore.AccountState
@@ -124,9 +124,7 @@ class ForgotPasswordForm extends React.Component<InjectedForgotPasswordFormProps
                     </span>
                 </div>
 
-                <div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
-                    <img src={waitGif} ></img>
-                </div>
+                <WaitPanel isContentReady={this.contentReady} />
 
                 <form id="captcha-form" role="form" onSubmit={this.props.handleSubmit(this.handleSubmitForm)}>
                     
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/account/LoginForm.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/account/LoginForm.tsx
index d8d6acb..622555c 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/account/LoginForm.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/account/LoginForm.tsx
@@ -10,8 +10,6 @@ import * as AccountModel from '../../models/Account';
 import * as Verify from '../../message/verify';
 import { toastr } from 'react-redux-toastr';
 
-const waitGif: string = require('../../theme/newspaper/img/wait.gif');
-
 type LoginBaseProps =
     AccountStore.AccountState
     & Toastr.ToastrState
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/account/RecoverPasswordForm.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/account/RecoverPasswordForm.tsx
index 0ea9f3f..7bbf323 100644
--- a/LibVisWeb/LibVisWeb/ClientApp/components/account/RecoverPasswordForm.tsx
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/account/RecoverPasswordForm.tsx
@@ -10,8 +10,6 @@ import * as AccountModel from '../../models/Account';
 import * as Verify from '../../message/verify';
 import { toastr } from 'react-redux-toastr';
 
-const waitGif: string = require('../../theme/newspaper/img/wait.gif');
-
 type RecoverPasswordBaseProps =
     AccountStore.AccountState
     & Toastr.ToastrState
diff --git a/LibVisWeb/LibVisWeb/ClientApp/components/common/WaitPanel.tsx b/LibVisWeb/LibVisWeb/ClientApp/components/common/WaitPanel.tsx
new file mode 100644
index 0000000..6cbfc24
--- /dev/null
+++ b/LibVisWeb/LibVisWeb/ClientApp/components/common/WaitPanel.tsx
@@ -0,0 +1,13 @@
+import * as React from 'react';
+
+const waitGif: string = require('../../theme/newspaper/img/wait.gif');
+
+type WaitPanelProps ={
+    isContentReady: Boolean;
+}
+
+export default (props: WaitPanelProps) => (
+    <div className={(!props.isContentReady ? "wait-panel" : "wait-panel-disabled")}>
+        <img src={waitGif} ></img>
+    </div>
+);