diff --git a/src/pages/ActorOverviewPage/ActorOverviewPage.tsx b/src/pages/ActorOverviewPage/ActorOverviewPage.tsx
index 57cdf6f..812fd9f 100644
--- a/src/pages/ActorOverviewPage/ActorOverviewPage.tsx
+++ b/src/pages/ActorOverviewPage/ActorOverviewPage.tsx
@@ -24,7 +24,9 @@ class ActorOverviewPage extends React.Component<props, state> {
             actors: [],
             NActorPopupVisible: false
         };
+    }
 
+    componentDidMount(): void {
         this.fetchAvailableActors();
     }
 
@@ -36,7 +38,7 @@ class ActorOverviewPage extends React.Component<props, state> {
                     <Button title='Add Actor' onClick={(): void => this.setState({NActorPopupVisible: true})}/>
                 </SideBar>
                 <div className={style.container}>
-                    {this.state.actors.map((el) => (<ActorTile actor={el}/>))}
+                    {this.state.actors.map((el) => (<ActorTile key={el.actor_id} actor={el}/>))}
                 </div>
                 {this.state.NActorPopupVisible ?
                     <NewActorPopup onHide={(): void => {
diff --git a/src/pages/CategoryPage/TagView.tsx b/src/pages/CategoryPage/TagView.tsx
index 057c480..079928b 100644
--- a/src/pages/CategoryPage/TagView.tsx
+++ b/src/pages/CategoryPage/TagView.tsx
@@ -54,9 +54,8 @@ class TagView extends React.Component<props, TagViewState> {
                 <div className={videocontainerstyle.maincontent}>
                     {this.state.loadedtags ?
                         this.state.loadedtags.map((m) => (
-                            <Link to={'/categories/' + m.tag_id}><TagPreview
-                                key={m.tag_id}
-                                name={m.tag_name}/></Link>
+                            <Link to={'/categories/' + m.tag_id} key={m.tag_id}>
+                                <TagPreview name={m.tag_name}/></Link>
                         )) :
                         'loading'}
                 </div>
diff --git a/src/pages/Player/Player.tsx b/src/pages/Player/Player.tsx
index 4e3e3c8..7c6e1ae 100644
--- a/src/pages/Player/Player.tsx
+++ b/src/pages/Player/Player.tsx
@@ -104,24 +104,7 @@ export class Player extends React.Component<myprops, mystate> {
                         <Button onClick={(): void => this.setState({popupvisible: true})} title='Give this Video a Tag' color={{backgroundColor: '#3574fe'}}/>
                         <Button title='Delete Video' onClick={(): void => {this.deleteVideo();}} color={{backgroundColor: 'red'}}/>
                     </div>
-                    {/* rendering of actor tiles */}
-                    <div className={style.actorcontainer}>
-                        {this.state.actors ?
-                            this.state.actors.map((actr: ActorType) => (
-                                <ActorTile actor={actr}/>
-                            )) : <></>
-                        }
-                        <div className={style.actorAddTile} onClick={(): void => {
-                            this.addActor();
-                        }}>
-                            <div className={style.actorAddTile_thumbnail}>
-                                <FontAwesomeIcon style={{
-                                    lineHeight: '130px'
-                                }} icon={faPlusCircle} size='5x'/>
-                            </div>
-                            <div className={style.actorAddTile_name}>Add Actor</div>
-                        </div>
-                    </div>
+                    {this.assembleActorTiles()}
                 </div>
                 <button className={style.closebutton} onClick={(): void => this.closebtn()}>Close</button>
                 {
@@ -148,7 +131,7 @@ export class Player extends React.Component<myprops, mystate> {
                 <Line/>
                 <SideBarTitle>Tags:</SideBarTitle>
                 {this.state.tags.map((m: TagType) => (
-                    <Tag tagInfo={m}/>
+                    <Tag key={m.tag_id} tagInfo={m}/>
                 ))}
                 <Line/>
                 <SideBarTitle>Tag Quickadd:</SideBarTitle>
@@ -164,6 +147,58 @@ export class Player extends React.Component<myprops, mystate> {
         );
     }
 
+    /**
+     * rendering of actor tiles
+     */
+    private assembleActorTiles(): JSX.Element {
+        return (
+            <div className={style.actorcontainer}>
+                {this.state.actors ?
+                    this.state.actors.map((actr: ActorType) => (
+                        <ActorTile key={actr.actor_id} actor={actr}/>
+                    )) : <></>
+                }
+                <div className={style.actorAddTile} onClick={(): void => {
+                    this.addActor();
+                }}>
+                    <div className={style.actorAddTile_thumbnail}>
+                        <FontAwesomeIcon style={{
+                            lineHeight: '130px'
+                        }} icon={faPlusCircle} size='5x'/>
+                    </div>
+                    <div className={style.actorAddTile_name}>Add Actor</div>
+                </div>
+            </div>
+        );
+    }
+
+
+    /**
+     * handle the popovers generated according to state changes
+     * @returns {JSX.Element}
+     */
+    handlePopOvers(): JSX.Element {
+        return (
+            <>
+                {this.state.popupvisible ?
+                    <AddTagPopup onHide={(): void => {
+                        this.setState({popupvisible: false});
+                    }}
+                                 submit={this.quickAddTag}
+                                 movie_id={this.state.movie_id}/> :
+                    null
+                }
+                {
+                    this.state.actorpopupvisible ?
+                        <AddActorPopup onHide={(): void => {
+                            this.refetchActors();
+                            this.setState({actorpopupvisible: false});
+                        }} movie_id={this.state.movie_id}/> : null
+                }
+            </>
+        );
+    }
+
     /**
      * quick add callback to add tag to db and change gui correctly
      * @param tagId id of tag to add
@@ -210,32 +245,6 @@ export class Player extends React.Component<myprops, mystate> {
         });
     }
 
-    /**
-     * handle the popovers generated according to state changes
-     * @returns {JSX.Element}
-     */
-    handlePopOvers(): JSX.Element {
-        return (
-            <>
-                {this.state.popupvisible ?
-                    <AddTagPopup onHide={(): void => {
-                        this.setState({popupvisible: false});
-                    }}
-                                 submit={this.quickAddTag}
-                                 movie_id={this.state.movie_id}/> :
-                    null
-                }
-                {
-                    this.state.actorpopupvisible ?
-                        <AddActorPopup onHide={(): void => {
-                            this.refetchActors();
-                            this.setState({actorpopupvisible: false});
-                        }} movie_id={this.state.movie_id}/> : null
-                }
-            </>
-        );
-    }
-
     /**
      * fetch all the required infos of a video from backend
      */
diff --git a/src/pages/SettingsPage/MovieSettings.test.js b/src/pages/SettingsPage/MovieSettings.test.js
index f7bc706..1d04434 100644
--- a/src/pages/SettingsPage/MovieSettings.test.js
+++ b/src/pages/SettingsPage/MovieSettings.test.js
@@ -1,6 +1,7 @@
 import {shallow} from 'enzyme';
 import React from 'react';
 import MovieSettings from './MovieSettings';
+import {callAPI} from "../../utils/Api";
 
 describe('<MovieSettings/>', function () {
     it('renders without crashing ', function () {
@@ -49,64 +50,79 @@ describe('<MovieSettings/>', function () {
         });
     });
 
-    it('content available received and in state', done => {
-        global.fetch = global.prepareFetchApi({
+    it('content available received and in state', () => {
+        const wrapper = shallow(<MovieSettings/>);
+
+        callAPIMock({
             contentAvailable: true,
             message: 'firstline\nsecondline'
-        });
-        const wrapper = shallow(<MovieSettings/>);
+        })
+
         wrapper.instance().updateStatus();
 
-        process.nextTick(() => {
-            expect(wrapper.state()).toMatchObject({
-                text: [
-                    'firstline',
-                    'secondline'
-                ]
-            });
-
-            global.fetch.mockClear();
-            done();
+        expect(wrapper.state()).toMatchObject({
+            text: [
+                'firstline',
+                'secondline'
+            ]
         });
     });
 
-    it('test reindex with no content available', done => {
-        global.fetch = global.prepareFetchApi({
+    it('test reindex with no content available', () => {
+        callAPIMock({
             contentAvailable: false
-        });
+        })
 
         global.clearInterval = jest.fn();
 
         const wrapper = shallow(<MovieSettings/>);
         wrapper.instance().updateStatus();
 
-        process.nextTick(() => {
-            // expect the refresh interval to be cleared
-            expect(global.clearInterval).toBeCalledTimes(1);
+        // expect the refresh interval to be cleared
+        expect(global.clearInterval).toBeCalledTimes(1);
 
-            // expect startbtn to be reenabled
-            expect(wrapper.state()).toMatchObject({startbtnDisabled: false});
-
-            global.fetch.mockClear();
-            done();
-        });
+        // expect startbtn to be reenabled
+        expect(wrapper.state()).toMatchObject({startbtnDisabled: false});
     });
 
-    it('test simulate gravity cleanup', done => {
-        global.fetch = global.prepareFetchApi('mmi');
+    it('test simulate gravity cleanup', () => {
+        // global.fetch = global.prepareFetchApi('mmi');
+        callAPIMock({})
         const wrapper = shallow(<MovieSettings/>);
-        wrapper.instance().setState = jest.fn(),
+        wrapper.instance().setState = jest.fn();
 
-            wrapper.find('button').findWhere(e => e.text() === 'Cleanup Gravity' && e.type() === 'button').simulate('click');
+        wrapper.find('button').findWhere(e => e.text() === 'Cleanup Gravity' && e.type() === 'button').simulate('click');
 
         // initial send of reindex request to server
-        expect(global.fetch).toBeCalledTimes(1);
+        expect(callAPI).toBeCalledTimes(1);
 
-        process.nextTick(() => {
-            expect(wrapper.instance().setState).toBeCalledTimes(1);
+        expect(wrapper.instance().setState).toBeCalledTimes(1);
+    });
 
-            global.fetch.mockClear();
-            done();
+    it('test no textDiv insertion if string is empty', function () {
+        const wrapper = shallow(<MovieSettings/>);
+
+        callAPIMock({
+            contentAvailable: true,
+            message: 'test'
+        })
+
+        wrapper.instance().updateStatus();
+
+        expect(wrapper.state()).toMatchObject({
+            text: ['test']
+        });
+
+        // expect an untouched state if we try to add an empty string...
+        callAPIMock({
+            contentAvailable: true,
+            message: ''
+        })
+
+        wrapper.instance().updateStatus();
+
+        expect(wrapper.state()).toMatchObject({
+            text: ['test']
         });
     });
 });
diff --git a/src/pages/SettingsPage/MovieSettings.tsx b/src/pages/SettingsPage/MovieSettings.tsx
index 74ce36b..2dd5cd0 100644
--- a/src/pages/SettingsPage/MovieSettings.tsx
+++ b/src/pages/SettingsPage/MovieSettings.tsx
@@ -47,7 +47,7 @@ class MovieSettings extends React.Component<props, state> {
                         onClick={(): void => {this.cleanupGravity();}}>Cleanup Gravity
                 </button>
                 <div className={style.indextextarea}>{this.state.text.map(m => (
-                    <div className='textarea-element'>{m}</div>
+                    <div key={m} className='textarea-element'>{m}</div>
                 ))}</div>
             </>
         );
@@ -85,8 +85,11 @@ class MovieSettings extends React.Component<props, state> {
      */
     updateStatus = (): void => {
         callAPI(APINode.Settings, {action: 'getStatusMessage'}, (result: SettingsTypes.getStatusMessageType) => {
-            if (result.contentAvailable === true) {
+            if (result.contentAvailable) {
+                // ignore if message is empty
                 console.log(result);
+                if(result.message === '') return;
+
                 // todo 2020-07-4: scroll to bottom of div here
                 this.setState({
                     // insert a string for each line