diff --git a/package.json b/package.json
index e2c5e69..c13873a 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
       "text-summary"
     ]
   },
-  "proxy": "http://192.168.0.248",
+  "proxy": "http://192.168.0.42",
   "homepage": "/",
   "eslintConfig": {
     "extends": "react-app"
diff --git a/src/elements/Preview/Preview.js b/src/elements/Preview/Preview.js
index c3a6810..394a008 100644
--- a/src/elements/Preview/Preview.js
+++ b/src/elements/Preview/Preview.js
@@ -13,10 +13,6 @@ class Preview extends React.Component {
         };
     }
 
-    componentWillUnmount() {
-        this.setState({});
-    }
-
     componentDidMount() {
         this.setState({
             previewpicture: null,
@@ -30,9 +26,9 @@ class Preview extends React.Component {
         fetch('/api/videoload.php', {method: 'POST', body: updateRequest})
             .then((response) => response.text()
                 .then((result) => {
-                    this.setState(prevState => ({
-                        ...prevState.previewpicture, previewpicture: result
-                    }));
+                    this.setState({
+                        previewpicture: result
+                    });
                 }));
     }
 
diff --git a/src/pages/SettingsPage/GeneralSettings.js b/src/pages/SettingsPage/GeneralSettings.js
index 618d6a7..7d39876 100644
--- a/src/pages/SettingsPage/GeneralSettings.js
+++ b/src/pages/SettingsPage/GeneralSettings.js
@@ -6,31 +6,58 @@ class GeneralSettings extends React.Component {
     constructor(props) {
         super(props);
 
-        this.state = {};
+        this.state = {
+            tvshowsupport: false,
+            videopath: "",
+            tvshowpath: ""
+        };
+    }
+
+    componentDidMount() {
+        const updateRequest = new FormData();
+        updateRequest.append('action', 'loadVideo');
+        updateRequest.append('movieid', this.props.movie_id);
+
+        fetch('/api/videoload.php', {method: 'POST', body: updateRequest})
+            .then((response) => response.json()
+                .then((result) => {
+                    // todo 2020-07-3: set state here
+                }));
     }
 
     render() {
         return (
             <>
-                Generalsettings here
                 <div className='GeneralForm'>
                     <Form>
                         <Form.Row>
                             <Form.Group as={Col} controlId="formGridEmail">
                                 <Form.Label>Video Path</Form.Label>
-                                <Form.Control type="text" placeholder="todo password here" />
+                                <Form.Control type="text" placeholder="/var/www/html/video"/>
                             </Form.Group>
 
                             <Form.Group as={Col} controlId="formGridPassword">
-                                <Form.Label>Password</Form.Label>
-                                <Form.Control type="password" placeholder="Password" />
+                                <Form.Label>TV Show Path</Form.Label>
+                                <Form.Control type='text' placeholder="/var/www/html/tvshow"/>
                             </Form.Group>
                         </Form.Row>
 
-                        <Form.Group controlId="formGridAddress1">
-                            <Form.Label>Address</Form.Label>
-                            <Form.Control placeholder="1234 Main St" />
-                        </Form.Group>
+                        <Form.Check
+                            type="switch"
+                            id="custom-switch"
+                            label="Enable Password support"
+                            onChange={() => {
+                                this.setState({tvshowsupport: !this.state.tvshowsupport})
+                            }}
+                        />
+
+                        {this.state.tvshowsupport ?
+                            <Form.Group controlId="passwordfield">
+                                <Form.Label>Password</Form.Label>
+                                <Form.Control type="password" placeholder="**********"/>
+                            </Form.Group> : null
+                        }
+
 
                         <Button variant="primary" type="submit">
                             Submit
diff --git a/src/pages/SettingsPage/GeneralSettings.test.js b/src/pages/SettingsPage/GeneralSettings.test.js
index 88d2f6a..a026ead 100644
--- a/src/pages/SettingsPage/GeneralSettings.test.js
+++ b/src/pages/SettingsPage/GeneralSettings.test.js
@@ -16,5 +16,12 @@ describe('<GeneralSettings/>', function () {
         wrapper.unmount();
     });
 
-    
+    it('test password hide/show switchbutton', function () {
+        const wrapper = shallow(<GeneralSettings/>);
+
+        expect(wrapper.find("FormGroup").findWhere(it => it.props().controlId === "passwordfield")).toHaveLength(0);
+        wrapper.find("FormCheck").findWhere(it => it.props().label === "Enable Password support").simulate("change");
+
+        expect(wrapper.find("FormGroup").findWhere(it => it.props().controlId === "passwordfield")).toHaveLength(1);
+    });
 });