diff --git a/storybook/iframe.html b/storybook/iframe.html
index f24a1785..53b7c12d 100644
--- a/storybook/iframe.html
+++ b/storybook/iframe.html
@@ -135,7 +135,7 @@
       
     
       
-        <script src="static/iframe.2cc979610ca2058191c8.bundle.js" defer></script>
+        <script src="static/iframe.5bd7ee3791616590d84a.bundle.js" defer></script>
       
     
   
diff --git a/storybook/static/iframe.5bd7ee3791616590d84a.bundle.js b/storybook/static/iframe.5bd7ee3791616590d84a.bundle.js
new file mode 100644
index 00000000..cd4be7ad
--- /dev/null
+++ b/storybook/static/iframe.5bd7ee3791616590d84a.bundle.js
@@ -0,0 +1,2 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([[0],{"./.storybook/config.js":function(e,o,n){"use strict";(function(e){var o=n("./node_modules/@storybook/react/dist/client/index.js"),t=n("./node_modules/storybook-addon-styled-component-theme/dist/index.js"),i=n("./node_modules/@storybook/components/dist/index.js"),r=n("./node_modules/@storybook/addon-options/preview.js"),s=n("./node_modules/@storybook/addon-info/dist/index.js"),l=n("./node_modules/@storybook/addon-backgrounds/dist/index.js"),d=n("./app/themes/index.js");(0,o.addDecorator)((0,s.withInfo)({inline:!0})),(0,o.addDecorator)((0,r.withOptions)({name:"Zap Desktop",url:"https://ln-zap.github.io/zap-desktop",theme:i.themes.dark,addonPanelInRight:!0})),(0,o.addDecorator)((0,l.withBackgrounds)([{name:"dark",value:d.dark.colors.darkestBackground,default:!0},{name:"light",value:d.light.colors.darkestBackground}]));const a=[d.dark,d.light];console.log(a),(0,o.addDecorator)((0,t.withThemesProvider)(a));const c=n("./stories sync recursive .stories.js$");(0,o.configure)(function(){c.keys().forEach(e=>c(e))},e)}).call(this,n("./node_modules/webpack/buildin/module.js")(e))},"./app/components/UI/Button.js":function(e,o,n){"use strict";Object.defineProperty(o,"__esModule",{value:!0});var t,i=(t="function"==typeof Symbol&&Symbol.for&&Symbol.for("react.element")||60103,function(e,o,n,i){var r=e&&e.defaultProps,s=arguments.length-3;if(o||0===s||(o={}),o&&r)for(var l in r)void 0===o[l]&&(o[l]=r[l]);else o||(o=r||{});if(1===s)o.children=i;else if(s>1){for(var d=Array(s),a=0;a<s;a++)d[a]=arguments[a+3];o.children=d}return{$$typeof:t,type:e,key:void 0===n?null:""+n,ref:null,props:o,_owner:null}}),r=a(n("./node_modules/react/index.js")),s=(a(n("./node_modules/prop-types/index.js")),a(n("./node_modules/styled-components/dist/styled-components.browser.esm.js"))),l=n("./node_modules/rebass/dist/index.js"),d=a(n("./app/components/UI/Spinner.js"));function a(e){return e&&e.__esModule?e:{default:e}}const c=(0,s.default)(l.Button).withConfig({displayName:"Button__Wrapper",componentId:"sc-1p666ep-0"})(["transition:all 0.25s;outline:none;&:focus{<<<<<<< HEAD box-shadow:0 0 3px ",";======= box-shadow:0 0 3px ",";>>>>>>> fix(styles):clean up and standardize buttons}&:disabled{opacity:0.5;}&:hover:enabled{cursor:pointer;}"],e=>e.theme.lightningOrange,e=>e.theme.colors.gray);var u=i(d.default,{size:"0.7em",mr:"0.4em"});const f=e=>{const{children:o,processing:n}=e;let t=o;return n&&(t=i("span",{},void 0,u," ",e.children)),r.default.createElement(c,e,t)};f.displayName="Button",f.defaultProps={fontWeight:"normal",variant:"normal",processing:!1,borderRadius:5},o.default=f,e.exports=o.default},"./app/components/UI/Spinner.js":function(e,o,n){"use strict";Object.defineProperty(o,"__esModule",{value:!0});var t,i=n("./node_modules/styled-components/dist/styled-components.browser.esm.js"),r=(t=i)&&t.__esModule?t:{default:t},s=n("./node_modules/rebass/dist/index.js");const l=(0,i.keyframes)(["from{transform:rotate(0deg);}to{transform:rotate(360deg);}"]),d=(0,r.default)(s.Card).withConfig({displayName:"Spinner",componentId:"iofmpk-0"})(["border:1px solid rgba(235,184,100,0.1);border-left-color:rgba(235,184,100,0.6);display:inline-block;animation:"," 1s linear infinite;}"],l);d.displayName="Spinner",d.defaultProps={borderRadius:999,width:"0.8em",css:{height:"0.8em"}},o.default=d,e.exports=o.default},"./app/themes/base.js":function(e,o,n){"use strict";Object.defineProperty(o,"__esModule",{value:!0});const t=o.space=[0,4,8,16,32,64,128,256],i=o.fontSizes={xxs:"8px",xs:"10px",s:"11px",m:"13px",l:"15px",xl:"18px",xxl:"30px",xxxl:"60px"},r=o.fontWeights={normal:400,bold:600},s=o.fonts={sans:"Roboto, system-ui, sans-serif",mono:'"SF Mono", "Roboto Mono", Menlo, monospace'},l=o.letterSpacings={normal:"normal",caps:"0.025em"};o.default={space:t,fontSizes:i,fontWeights:r,fonts:s,letterSpacings:l}},"./app/themes/dark.js":function(e,o,n){"use strict";Object.defineProperty(o,"__esModule",{value:!0});var t,i=Object.assign||function(e){for(var o=1;o<arguments.length;o++){var n=arguments[o];for(var t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t])}return e},r=n("./app/themes/base.js"),s=(t=r)&&t.__esModule?t:{default:t};const l={white:"#fff",black:"#000",gray:"#959595",invisibleGray:"#555",lightningOrange:"#fd9800",superGreen:"#39e673",superRed:"#e63939",darkestBackground:"#242633",lightBackground:"#313340",lightestBackground:"#373947",primaryText:"#fff",gradient:"linear-gradient(270deg, #868b9f 0%, #333c5e 100%)"},d={normal:{backgroundColor:l.lightBackground,color:l.lightningOrange,"&:hover:enabled":{backgroundColor:l.lightningOrange,color:l.lightBackground}},primary:{backgroundColor:l.lightningOrange,color:l.white}};o.default=i({name:"dark"},s.default,{colors:l,buttons:d}),e.exports=o.default},"./app/themes/index.js":function(e,o,n){"use strict";Object.defineProperty(o,"__esModule",{value:!0}),o.light=o.dark=void 0;var t=r(n("./app/themes/dark.js")),i=r(n("./app/themes/light.js"));function r(e){return e&&e.__esModule?e:{default:e}}o.dark=t.default,o.light=i.default},"./app/themes/light.js":function(e,o,n){"use strict";Object.defineProperty(o,"__esModule",{value:!0});var t,i=Object.assign||function(e){for(var o=1;o<arguments.length;o++){var n=arguments[o];for(var t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t])}return e},r=n("./app/themes/base.js"),s=(t=r)&&t.__esModule?t:{default:t};const l={white:"#fff",black:"#000",gray:"#959595",invisibleGray:"#555",lightningOrange:"#fd9800",superGreen:"#39e673",superRed:"#e63939",darkestBackground:"#fff",lightBackground:"#ebebeb",lightestBackground:"#f3f3f3",primaryText:"#000",gradient:"linear-gradient(270deg, #fd9800 0%, #ffbd59 100%)"},d={normal:{backgroundColor:l.lightBackground,color:l.lightningOrange,"&:hover:enabled":{backgroundColor:l.lightningOrange,color:l.lightBackground}},primary:{backgroundColor:l.lightningOrange,color:l.white}};o.default=i({name:"light"},s.default,{colors:l,buttons:d}),e.exports=o.default},"./node_modules/nested-object-assign/lib sync recursive ^\\.\\/.*$":function(e,o,n){var t={"./nestedObjectAssign":"./node_modules/nested-object-assign/lib/nestedObjectAssign.js","./nestedObjectAssign.js":"./node_modules/nested-object-assign/lib/nestedObjectAssign.js"};function i(e){var o=r(e);return n(o)}function r(e){var o=t[e];if(!(o+1)){var n=new Error("Cannot find module '"+e+"'");throw n.code="MODULE_NOT_FOUND",n}return o}i.keys=function(){return Object.keys(t)},i.resolve=r,e.exports=i,i.id="./node_modules/nested-object-assign/lib sync recursive ^\\.\\/.*$"},"./stories sync recursive .stories.js$":function(e,o,n){var t={"./button.stories.js":"./stories/button.stories.js","./spinner.stories.js":"./stories/spinner.stories.js"};function i(e){var o=r(e);return n(o)}function r(e){var o=t[e];if(!(o+1)){var n=new Error("Cannot find module '"+e+"'");throw n.code="MODULE_NOT_FOUND",n}return o}i.keys=function(){return Object.keys(t)},i.resolve=r,e.exports=i,i.id="./stories sync recursive .stories.js$"},"./stories/button.stories.js":function(e,o,n){"use strict";(function(e){Object.defineProperty(o,"__esModule",{value:!0}),o.__ADDS_MAP__=o.__STORY__=o.withStorySource=void 0;var t,i=(t="function"==typeof Symbol&&Symbol.for&&Symbol.for("react.element")||60103,function(e,o,n,i){var r=e&&e.defaultProps,s=arguments.length-3;if(o||0===s||(o={}),o&&r)for(var l in r)void 0===o[l]&&(o[l]=r[l]);else o||(o=r||{});if(1===s)o.children=i;else if(s>1){for(var d=Array(s),a=0;a<s;a++)d[a]=arguments[a+3];o.children=d}return{$$typeof:t,type:e,key:void 0===n?null:""+n,ref:null,props:o,_owner:null}}),r=(c(n("./node_modules/react/index.js")),n("./node_modules/@storybook/react/dist/client/index.js")),s=n("./node_modules/@storybook/addon-actions/dist/index.js"),l=c(n("./app/components/UI/Button.js")),d=c(n("./app/node_modules/react-icons/lib/md/navigate-before.js")),a=c(n("./app/node_modules/react-icons/lib/md/navigate-next.js"));function c(e){return e&&e.__esModule?e:{default:e}}var u=o.withStorySource=n("./node_modules/@storybook/addon-storysource/dist/index.js").withStorySource,f=o.__STORY__="import React from 'react';\nimport { storiesOf } from '@storybook/react';\nimport { action } from '@storybook/addon-actions';\nimport Button from 'components/UI/Button';\nimport MdNavigateBefore from 'react-icons/lib/md/navigate-before';\nimport MdNavigateNext from 'react-icons/lib/md/navigate-next';\n\nstoriesOf('Buttons', module)\n  .add('Basic', () => <Button onClick={action('clicked')}>Basic button</Button>)\n  .add('With Icon', () => (\n    <section>\n      <Button onClick={action('clicked')}>\n        <MdNavigateBefore pr=\"0.4em\" />\n        Previous\n      </Button>{' '}\n      <Button onClick={action('clicked')}>\n        Next\n        <MdNavigateNext />\n      </Button>\n    </section>\n  ))\n  .add('Processing', () => (\n    <Button processing onClick={action('clicked')}>\n      Processing\n    </Button>\n  ))\n  .add('Disabled', () => (\n    <Button disabled onClick={action('clicked')}>\n      Disabled button\n    </Button>\n  ))\n  .add('Primary', () => (\n    <Button onClick={action('clicked')} variant=\"primary\">\n      Primary button\n    </Button>\n  ))\n  .add('xx-small', () => (\n    <Button onClick={action('clicked')} fontSize=\"xxs\">\n      xx-small button\n    </Button>\n  ))\n  .add('x-small', () => (\n    <Button onClick={action('clicked')} fontSize=\"xs\">\n      x-small button\n    </Button>\n  ))\n  .add('small', () => (\n    <Button onClick={action('clicked')} fontSize=\"s\">\n      small button\n    </Button>\n  ))\n  .add('medium', () => (\n    <Button onClick={action('clicked')} fontSize=\"m\">\n      medium button\n    </Button>\n  ))\n  .add('large', () => (\n    <Button onClick={action('clicked')} fontSize=\"l\">\n      large button\n    </Button>\n  ))\n  .add('x-large', () => (\n    <Button onClick={action('clicked')} fontSize=\"xl\">\n      x-large button\n    </Button>\n  ))\n  .add('xx-large', () => (\n    <Button onClick={action('clicked')} fontSize=\"xxl\">\n      xx-large button\n    </Button>\n  ))\n  .add('xxx-large', () => (\n    <Button onClick={action('clicked')} fontSize=\"xxxl\">\n      xxx-large button\n    </Button>\n  ));\n",p=o.__ADDS_MAP__={"Buttons@xxx-large":{startLoc:{col:7,line:72},endLoc:{col:3,line:76}},"Buttons@xx-large":{startLoc:{col:7,line:67},endLoc:{col:3,line:71}},"Buttons@x-large":{startLoc:{col:7,line:62},endLoc:{col:3,line:66}},"Buttons@large":{startLoc:{col:7,line:57},endLoc:{col:3,line:61}},"Buttons@medium":{startLoc:{col:7,line:52},endLoc:{col:3,line:56}},"Buttons@small":{startLoc:{col:7,line:47},endLoc:{col:3,line:51}},"Buttons@x-small":{startLoc:{col:7,line:42},endLoc:{col:3,line:46}},"Buttons@xx-small":{startLoc:{col:7,line:37},endLoc:{col:3,line:41}},"Buttons@Primary":{startLoc:{col:7,line:32},endLoc:{col:3,line:36}},"Buttons@Disabled":{startLoc:{col:7,line:27},endLoc:{col:3,line:31}},"Buttons@Processing":{startLoc:{col:7,line:22},endLoc:{col:3,line:26}},"Buttons@With Icon":{startLoc:{col:7,line:10},endLoc:{col:3,line:21}},"Buttons@Basic":{startLoc:{col:7,line:9},endLoc:{col:79,line:9}}},m=i(d.default,{pr:"0.4em"}),g=i(a.default,{});(0,r.storiesOf)("Buttons",e).addDecorator(u(f,p)).add("Basic",()=>i(l.default,{onClick:(0,s.action)("clicked")},void 0,"Basic button")).add("With Icon",()=>i("section",{},void 0,i(l.default,{onClick:(0,s.action)("clicked")},void 0,m,"Previous")," ",i(l.default,{onClick:(0,s.action)("clicked")},void 0,"Next",g))).add("Processing",()=>i(l.default,{processing:!0,onClick:(0,s.action)("clicked")},void 0,"Processing")).add("Disabled",()=>i(l.default,{disabled:!0,onClick:(0,s.action)("clicked")},void 0,"Disabled button")).add("Primary",()=>i(l.default,{onClick:(0,s.action)("clicked"),variant:"primary"},void 0,"Primary button")).add("xx-small",()=>i(l.default,{onClick:(0,s.action)("clicked"),fontSize:"xxs"},void 0,"xx-small button")).add("x-small",()=>i(l.default,{onClick:(0,s.action)("clicked"),fontSize:"xs"},void 0,"x-small button")).add("small",()=>i(l.default,{onClick:(0,s.action)("clicked"),fontSize:"s"},void 0,"small button")).add("medium",()=>i(l.default,{onClick:(0,s.action)("clicked"),fontSize:"m"},void 0,"medium button")).add("large",()=>i(l.default,{onClick:(0,s.action)("clicked"),fontSize:"l"},void 0,"large button")).add("x-large",()=>i(l.default,{onClick:(0,s.action)("clicked"),fontSize:"xl"},void 0,"x-large button")).add("xx-large",()=>i(l.default,{onClick:(0,s.action)("clicked"),fontSize:"xxl"},void 0,"xx-large button")).add("xxx-large",()=>i(l.default,{onClick:(0,s.action)("clicked"),fontSize:"xxxl"},void 0,"xxx-large button"))}).call(this,n("./node_modules/webpack/buildin/module.js")(e))},"./stories/spinner.stories.js":function(e,o,n){"use strict";(function(e){Object.defineProperty(o,"__esModule",{value:!0}),o.__ADDS_MAP__=o.__STORY__=o.withStorySource=void 0;var t,i=(t="function"==typeof Symbol&&Symbol.for&&Symbol.for("react.element")||60103,function(e,o,n,i){var r=e&&e.defaultProps,s=arguments.length-3;if(o||0===s||(o={}),o&&r)for(var l in r)void 0===o[l]&&(o[l]=r[l]);else o||(o=r||{});if(1===s)o.children=i;else if(s>1){for(var d=Array(s),a=0;a<s;a++)d[a]=arguments[a+3];o.children=d}return{$$typeof:t,type:e,key:void 0===n?null:""+n,ref:null,props:o,_owner:null}}),r=(l(n("./node_modules/react/index.js")),n("./node_modules/@storybook/react/dist/client/index.js")),s=l(n("./app/components/UI/Spinner.js"));function l(e){return e&&e.__esModule?e:{default:e}}var d=o.withStorySource=n("./node_modules/@storybook/addon-storysource/dist/index.js").withStorySource,a=o.__STORY__="import React from 'react';\n\nimport { storiesOf } from '@storybook/react';\nimport Spinner from 'components/UI/Spinner';\n\nstoriesOf('Spinners', module).add('circle', () => <Spinner />);\n",c=o.__ADDS_MAP__={"Spinners@circle":{startLoc:{col:34,line:6},endLoc:{col:61,line:6}}},u=i(s.default,{});(0,r.storiesOf)("Spinners",e).addDecorator(d(a,c)).add("circle",()=>u)}).call(this,n("./node_modules/webpack/buildin/module.js")(e))},0:function(e,o,n){n("./node_modules/@storybook/core/dist/server/config/polyfills.js"),n("./node_modules/@storybook/core/dist/server/config/globals.js"),e.exports=n("./.storybook/config.js")}},[[0,3,2]]]);
+//# sourceMappingURL=iframe.5bd7ee3791616590d84a.bundle.js.map
\ No newline at end of file
diff --git a/storybook/static/iframe.5bd7ee3791616590d84a.bundle.js.map b/storybook/static/iframe.5bd7ee3791616590d84a.bundle.js.map
new file mode 100644
index 00000000..cd863222
--- /dev/null
+++ b/storybook/static/iframe.5bd7ee3791616590d84a.bundle.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"static/iframe.5bd7ee3791616590d84a.bundle.js","sources":["webpack:///./.storybook/config.js"],"sourcesContent":["import { addDecorator, configure, setAddon } from '@storybook/react'\nimport {withThemesProvider} from 'storybook-addon-styled-component-theme'\nimport { themes } from '@storybook/components';\nimport { withOptions } from '@storybook/addon-options'\nimport { withInfo } from '@storybook/addon-info'\nimport { withBackgrounds } from '@storybook/addon-backgrounds'\nimport { dark, light } from 'themes'\n\n// Info\naddDecorator(withInfo({ inline: true }))\n\n// Options\naddDecorator(withOptions({\n  name: 'Zap Desktop',\n  url: 'https://ln-zap.github.io/zap-desktop',\n  theme: themes.dark,\n  addonPanelInRight: true\n}))\n\n// Backgrounds\naddDecorator(\n  withBackgrounds([\n    { name: 'dark', value: dark.colors.darkestBackground, default: true },\n    { name: 'light', value: light.colors.darkestBackground },\n  ])\n);\n\n// Themes.\nconst zapThemes = [dark, light]\nconsole.log(zapThemes)\naddDecorator(withThemesProvider(zapThemes));\n\n// automatically import all files ending in *.stories.js\nconst req = require.context('../stories', true, /.stories.js$/);\nfunction loadStories() {\n  req.keys().forEach(filename => req(filename));\n}\n\nconfigure(loadStories, module);\n"],"mappings":"AAAA","sourceRoot":""}
\ No newline at end of file