diff --git a/src/components/alert/index.js b/src/components/alert/index.js
new file mode 100644
index 0000000..f6d08aa
--- /dev/null
+++ b/src/components/alert/index.js
@@ -0,0 +1,10 @@
+import React, { Component } from 'react';
+import { translate } from 'react-i18next';
+import style from './theme.styl';
+
+export default (props) => (
+    <div className={style['success']}>
+        {props.message}
+        <i className="material-icons">check</i>
+    </div>
+)
diff --git a/src/components/alert/theme.styl b/src/components/alert/theme.styl
new file mode 100644
index 0000000..5845d48
--- /dev/null
+++ b/src/components/alert/theme.styl
@@ -0,0 +1,35 @@
+.success
+    background: #33AA65
+    padding: 10px 30px
+    border-radius: 30px
+    z-index: 999
+    position fixed
+    bottom 25px
+    right 50px
+    color $Text1
+    font-family $MainFont, $AlternateFont
+    font-size 16px
+    i
+        font-size 14px
+
+    #checkmark-notify
+        display inline-block
+        width 20px
+        height 20px
+        transform rotate(45deg)
+
+    #stem-notify
+        position absolute
+        width 3px
+        height 12px
+        background-color $Text1
+        left 11px
+        top 6px
+
+    #kick-notify
+        position absolute
+        width 6px
+        height 3px
+        background-color $Text1
+        left 6px
+        top 15px
diff --git a/src/components/button/index.js b/src/components/button/index.js
new file mode 100644
index 0000000..225b2c0
--- /dev/null
+++ b/src/components/button/index.js
@@ -0,0 +1,9 @@
+import React, { Component } from 'react';
+import { translate } from 'react-i18next';
+import style from './theme.styl';
+
+export default (props) => (
+    <div className={style.button}>
+       {props.text}
+    </div>
+)
diff --git a/src/components/button/theme.styl b/src/components/button/theme.styl
new file mode 100644
index 0000000..c5d7a52
--- /dev/null
+++ b/src/components/button/theme.styl
@@ -0,0 +1,9 @@
+.button
+    font-family: $TitleFont
+    background: $MainColor
+    color: $Pure_White
+    text-transform: uppercase
+    display: inline-block
+    padding: 5px 10px
+    border-radius: 4px
+    cursor: pointer
diff --git a/src/row/index.js b/src/components/row/index.js
similarity index 100%
rename from src/row/index.js
rename to src/components/row/index.js
diff --git a/src/row/theme.styl b/src/components/row/theme.styl
similarity index 79%
rename from src/row/theme.styl
rename to src/components/row/theme.styl
index 6ffad8d..1838022 100644
--- a/src/row/theme.styl
+++ b/src/components/row/theme.styl
@@ -6,7 +6,7 @@
     border-bottom 1px solid rgba(225,225,225,0.15)
     padding 35px 20px
     transition: all 0.3s ease
-    transition-property: transform, opacity;
+    transition-property: background, transform, opacity;
     background-color: $BgColor1
     &.advanced
         overflow: hidden
@@ -50,7 +50,7 @@
         input[type=text],
         input[type=number],
         input[type=password]
-            padding: 5px 10px
+            padding: 7px 10px
             border-radius 5px
             color #FFF
             outline 0
@@ -62,17 +62,3 @@
             background $InputBg
             -webkit-box-shadow: inset 0px 0px 1px 0px rgba(0,0,0,0.85)
             transition background .2s ease
-
-
-        input[type=text]
-            &.dir-path
-                width: 225px
-
-        .btn
-            font-family: $TitleFont
-            background: $MainColor
-            color: $Pure_White
-            text-transform: uppercase
-            i
-                margin: 0 5px 0 0
-                font-size: 18px
diff --git a/src/switch/index.js b/src/components/switch/index.js
similarity index 87%
rename from src/switch/index.js
rename to src/components/switch/index.js
index a4a430e..c3dd79b 100644
--- a/src/switch/index.js
+++ b/src/components/switch/index.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { translate } from 'react-i18next';
-import style from './styl/theme.styl';
+import style from './theme.styl';
 
 export default (props) => (
     <label className={style.switch}>
diff --git a/src/switch/styl/theme.styl b/src/components/switch/theme.styl
similarity index 100%
rename from src/switch/styl/theme.styl
rename to src/components/switch/theme.styl
diff --git a/src/index.js b/src/index.js
index e4f0f25..d021952 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,8 +2,10 @@ import React, { Component } from 'react';
 import { translate } from 'react-i18next';
 import style from './styl/theme.styl';
 
-import Row from './row';
-import Switch from './switch';
+import Row from './components/row';
+import Alert from './components/alert';
+import Button from './components/button';
+import Switch from './components/switch';
 
 let GoBackButton = (props) => (
     <div className={style['go-back']}>
@@ -29,13 +31,6 @@ let ActionBar = (props) => (
     </div>
 )
 
-let SuccessAlert = (props) => (
-    <div className={style['success_alert']} style={{display:'none'}}>
-        {props.t('Saved')}
-        <i className={style['material-icons']}>check</i>
-    </div>
-                               )
-
 let CloseButton = (props) => (props)
 
 let NavTabs = (props) => (
@@ -57,10 +52,13 @@ class Settings extends Component {
         return (
             <div>
                 <Row icon="collections_bookmark" title="Torrent Collection" helper="Display a view with your Torrent Collection" action={<Switch/>}/>
+                <Row icon="folder" title="Cache Directory" helper="Open the Directory where Butter keep it's cache" action={<Button text={props.t('Open')}/>}/>
+                <Row icon="location_on" title="IP Adress" helper="Set this machine's IP Adress" action={<input type="text"/>}/>
+
                 <div className={[style['settings'], props.settings.showAdvancedsettings?'show-advanced':''].join(' ')}>
 
                     <div className={style['settings-container']}>
-                        <SuccessAlert {...props}/>
+                        <Alert message={props.t('Saved')}/>
                         <ActionBar {...props}/>
                         <NavTabs {...props}/>
                         <div className={style['tab-content-wrapper']}></div>
diff --git a/src/styl/show_header.styl b/src/styl/show_header.styl
deleted file mode 100644
index bff65a4..0000000
--- a/src/styl/show_header.styl
+++ /dev/null
@@ -1,275 +0,0 @@
-    .show-header
-        width: 100vw
-        /*height: 25vh TODO: responsive header (especially poster)*/
-        min-height: 215px
-        background: $BgColor1
-
-        .sh-background
-            position: absolute
-            width: 100%
-            
-            .shc-img
-                position: absolute
-                min-height: 215px
-                width: 100vw
-                background-repeat: no-repeat
-                background-size: cover
-                background-position: center
-                -webkit-filter: blur(10px) brightness(0.7)
-                background-color $ShowBgColor1
-                opacity: 0
-
-        .sh-info
-            position: absolute
-            min-height: 215px
-            left: 198px
-            width: calc(100% - 198px)
-            display: flex
-            flex-direction: column
-            justify-content: space-between
-
-        .sh-poster
-            float: left
-            width: 198px
-            height: 100%
-
-            .shp-img
-                position relative
-                margin-left 32px
-                margin-top 10px
-                width 134px
-                height 197px
-                box-shadow 0px 0px 10px
-                background-size auto
-                background-position center
-                background-repeat no-repeat
-                border-radius 4px
-                opacity 0
-                background-color $ShowBgColor1
-                &.fadein
-                    transition: opacity .3s ease-in;
-                    opacity: 1
-        .sh-metadata
-            flex: 2
-            padding-top: 10px
-            padding-right: 45px
-
-            .shm-title
-                color #fff
-                font-family $Font
-                -webkit-font-smoothing antialiased
-                font-size 28px
-                margin-bottom 8px
-                margin-top: 5px
-
-            .shm-infos
-                div
-                    float: left
-                    font-size: 11px
-                    font-family: $MainFontBold
-                    color: #fff
-                    -webkit-font-smoothing: antialiased
-
-                div.shmi-imdb
-                    cursor: pointer
-                    background: url(../images/imdb.png) no-repeat
-                    width: 27px
-                    height: 16px
-                    position: relative
-                    top: -2px
-
-                div.shmi-rating
-                    cursor: pointer
-
-                    .hidden
-                        display: none
-
-                    .number-container-tv
-                        position: relative
-                        font-size: 12px
-                        font-family: $MainFontBold
-                        color: #FFF
-
-                        em
-                            font-size: 0.8em
-
-                    .star-container-tv
-                        position relative
-                        opacity 1
-
-                        .rating-star
-                            color #ffc900
-                            font-size 11px
-                            padding-right: 3px
-
-                        .rating-star-half
-                            color #ffc900
-                            font-size 11px
-                            margin-left -4px
-                            padding-right: 3px
-
-                        .rating-star-half-empty
-                            color #a3a5a7
-                            font-size 11px
-                            margin-left: -3px
-
-                        .rating-star-empty
-                            color #a3a5a7
-                            font-size 11px
-                            padding-right: 3px
-
-                        .rating-star-half-container
-                            width 1em
-                            height 1em
-                            line-height 1em
-                            margin-top 2px
-                            margin-right: -3px
-
-                span.dot
-                    margin 4.5px 15px 0 15px
-                    float left
-                    width 3px
-                    height 3px
-                    border-radius 2px
-                    background-clip padding-box
-                    background-color #dbdbdd
-                    cursor default
-
-            .shm-synopsis
-                color: #fff
-                float: left
-                width: 100%
-                text-align: justify
-                font-family: $MainFont
-                -webkit-font-smoothing: antialiased
-                font-size: 12px
-                line-height: 22px
-                max-height: 107px
-                padding-right: 8px
-                margin-top: 8px
-                overflow: hidden
-                scrollable()
-
-        .sh-actions
-            flex: 1
-            height: 20px
-            display: flex
-            flex-direction: row
-
-            .sha-bookmark
-                flex: 1
-                cursor: pointer
-                padding-left: 24px
-                color: #FFF
-                position: relative
-                font-family: $MainFont
-                font-smoothing: antialiased
-                font-size: 12px
-                line-height: 17px
-                &:before
-                    content: "\f004"
-                    font-family: FontAwesome
-                    position: absolute
-                    font-size: 18px
-                    color: #FFF
-                    top: 0
-                    left: 0
-                    bottom: 0
-                    right: 0
-                    opacity: 1
-                    transition: opacity 0.5s
-
-                &:after
-                    content: "\f004"
-                    font-family: FontAwesome
-                    position: absolute
-                    font-size: 18px
-                    color: $ButtonBgActive
-                    top: 0
-                    left: 0
-                    bottom: 0
-                    right: 0
-                    opacity: 0
-                    transition: opacity 0.5s
-
-                &:hover
-                    &:before
-                        opacity: 0
-
-                    &:after
-                        opacity: 1
-
-                &.selected
-                    height: 18px
-                    width: 200px
-                    &:before
-                        content: "\f004"
-                        font-family: FontAwesome
-                        position: absolute
-                        font-size: 18px
-                        color: $FavoriteColor
-                        top: 0
-                        left: 0
-                        bottom: 0
-                        right: 0
-                        opacity: 1
-                        transition: opacity 0.5s
-
-                    &:after
-                        content: "\f004"
-                        font-family: FontAwesome
-                        position: absolute
-                        font-size: 18px
-                        color: #FFF
-                        top: 0
-                        left: 0
-                        bottom: 0
-                        right: 0
-                        opacity: 0
-                        transition: opacity 0.5s
-
-                    &:hover
-                        &:before
-                            opacity: 0
-
-                        &:after
-                            opacity: 1
-
-            .sha-watched
-                flex: 1
-                cursor: pointer
-                padding-left: 24px
-                right: 45px
-                color: #FFF
-                position: absolute
-                font-family: $MainFont
-                font-smoothing: antialiased
-                font-size: 12px
-                line-height: 17px
-
-                &:before
-                    content: "\f070"
-                    font-family: FontAwesome
-                    position: absolute
-                    font-size: 18px
-                    color: #FFF
-                    left: 0
-                    opacity: 1
-                    transition: opacity 0.5s
-
-                &:after
-                    content: "\f00c"
-                    font-family: FontAwesome
-                    position: absolute
-                    font-size: 20px
-                    color: #299000
-                    left: 0
-                    opacity: 0
-                    transition: opacity 0.5s
-
-                &:hover, &.selected
-                    &:before
-                        opacity: 0
-                    &:after
-                        opacity: 1
-
diff --git a/src/styl/theme.styl b/src/styl/theme.styl
index a20eaf9..85fa2be 100644
--- a/src/styl/theme.styl
+++ b/src/styl/theme.styl
@@ -26,13 +26,6 @@
                 color: #FFF
                 font-size: 48px
 
-    .success_alert
-        background: #33AA65
-        padding: 10px 30px
-        border-radius: 30px
-        i
-            font-size 14px
-
     .settings-container
         z-index 1
         width 100%
@@ -102,38 +95,6 @@
                         max-width: 780px
                         margin: 0 auto
 
-    .success_alert
-        z-index: 999
-        position fixed
-        bottom 25px
-        right 50px
-        color $Text1
-        font-family $MainFont, $AlternateFont
-        font-size 16px
-
-        #checkmark-notify
-            display inline-block
-            width 20px
-            height 20px
-            transform rotate(45deg)
-
-        #stem-notify
-            position absolute
-            width 3px
-            height 12px
-            background-color $Text1
-            left 11px
-            top 6px
-
-        #kick-notify
-            position absolute
-            width 6px
-            height 3px
-            background-color $Text1
-            left 6px
-            top 15px
-
-
 .settings-container-contain
     section
         display none