diff --git a/src/ui-preferences/BooleanPreference.js b/src/ui-preferences/BooleanPreference.js
index 2d54d7e..b0cd184 100644
--- a/src/ui-preferences/BooleanPreference.js
+++ b/src/ui-preferences/BooleanPreference.js
@@ -1,4 +1,6 @@
 import Preference from './Preference';
+import {createEl, qs} from './utils';
+import toggleTemplate from '!!raw-loader!./templates/toggle.html';
 
 export default class BooleanPreference extends Preference {
 
@@ -7,17 +9,18 @@ export default class BooleanPreference extends Preference {
   }
 
   _buildEl() {
-    let el = super._buildEl();
-    el.type = 'checkbox';
-    return el;
+    return createEl(toggleTemplate);
   }
 
+  _getCheckbox(){
+    return qs('.toggle__checkbox', this.el);
+  }
   get() {
-    return this.el.checked;
+    return this._getCheckbox().checked;
   }
 
   set({value}) {
-    this.el.checked = !!value;
+    this._getCheckbox().checked = !!value;
     super.set({value});
   }
 }
diff --git a/src/ui-preferences/ChoicePreference.js b/src/ui-preferences/ChoicePreference.js
index 7a4cd66..95323ea 100644
--- a/src/ui-preferences/ChoicePreference.js
+++ b/src/ui-preferences/ChoicePreference.js
@@ -20,13 +20,21 @@ export default class ChoicePreference extends Preference {
   _addChoices() {
     for (let choice of this.choices) {
       const checkedAttr = this._defaultValue === choice.name ? 'checked' : '';
-      this.el.appendChild(createEl(`<div class="radio-container">
-        <input type="radio" name="${this.name}" value="${choice.name}" ${checkedAttr}>
-        <label for="${this.name}">${choice.label}</label>
-        <div class="radio-container__description">${choice.description}</div>
-    </div>
-      `));
+      const $radioContainer = createEl(`<div class="radio-container">
+          <input type="radio" name="${this.name}" value="${choice.name}" ${checkedAttr}>
+          <label for="${this.name}">${choice.label}</label>
+        </div>
+      `);
+      if (choice.description) {
+        $radioContainer.appendChild(createEl(`
+            <info-tooltip class="radio-container__description">
+                ${choice.description}
+            </info-tooltip>`
+        ));
+      }
+      this.el.appendChild($radioContainer);
     }
+
   }
 
   get() {
diff --git a/src/ui-preferences/ContainerPreference.js b/src/ui-preferences/ContainerPreference.js
index 72bb266..7151e7d 100644
--- a/src/ui-preferences/ContainerPreference.js
+++ b/src/ui-preferences/ContainerPreference.js
@@ -14,17 +14,14 @@ export default class ContainerPreference extends PreferenceGroup {
     this._preferences.push(new ChoicePreference({
       name: `${name}.lifetime`,
       label: 'Lifetime',
-      description: 'How long this container will live',
       choices: [
         {
           'name': 'forever',
           'label': 'Forever',
-          'description': 'Container will always be present after creation',
         },
         {
           'name': 'untilLastTab',
           'label': 'Until last tab is closed',
-          'description': 'Closing the last tab in the container will destroy the container',
         },
       ],
       defaultValue: 'forever',
diff --git a/src/ui-preferences/InfoTooltip.js b/src/ui-preferences/InfoTooltip.js
new file mode 100644
index 0000000..06f86a0
--- /dev/null
+++ b/src/ui-preferences/InfoTooltip.js
@@ -0,0 +1,19 @@
+import css from '!!raw-loader!./styles/InformationElement.css';
+import {createEl} from './utils';
+
+class InfoTooltip extends HTMLElement {
+  constructor() {
+    super();
+    let shadow = this.attachShadow({mode: 'open'});
+    shadow.appendChild(createEl(`<style>${css}</style>`));
+    shadow.appendChild(createEl(`<span class="wrapper">
+        <span class="icon">i</span>
+        <span class="info">${this.textContent}</span>
+    </span>
+    `));
+
+  }
+
+}
+
+customElements.define('info-tooltip', InfoTooltip);
diff --git a/src/ui-preferences/Preference.js b/src/ui-preferences/Preference.js
index ed87b39..3e0bbae 100644
--- a/src/ui-preferences/Preference.js
+++ b/src/ui-preferences/Preference.js
@@ -1,5 +1,5 @@
 import PreferenceStorage from '../Storage/PreferenceStorage';
-import preferenceContainerTemplate from '!!raw-loader!./templates/Preference.html';
+import template from '!!raw-loader!./templates/Preference.html';
 import {createEl, qs} from './utils';
 
 /**
@@ -22,7 +22,9 @@ export default class Preference {
   }
 
   _buildContainerEl() {
-    return createEl(preferenceContainerTemplate);
+    const $el = createEl(this.constructor.TEMPLATE);
+    $el.classList.add(`pref-${this.constructor.TYPE}`);
+    return $el;
   }
 
   _buildEl() {
@@ -31,6 +33,13 @@ export default class Preference {
     return el;
   }
 
+  _addDescription($label) {
+    if (!this.description) {
+      return;
+    }
+    $label.appendChild(createEl(`<info-tooltip>${this.description}</info-tooltip>`));
+  }
+
   /**
    * Registers the event listeners and decides when to trigger
    * an onChange event for the preference
@@ -85,8 +94,9 @@ export default class Preference {
    * Should fill the fields in {@see $container} with initial preference attributes and add {@see el} to the container
    */
   async fillContainer() {
-    qs('.pref-container__label', this.$container).innerHTML = this.label;
-    qs('.pref-container__description', this.$container).innerHTML = this.description;
+    const $label = qs('.preference__label', this.$container);
+    $label.innerHTML = this.label;
+    this._addDescription($label);
     this._fillDocLink();
 
     // Append the el
@@ -172,5 +182,6 @@ export default class Preference {
 
 }
 
-Preference.EL_CLASS = 'pref-container__el';
+Preference.TEMPLATE = template;
+Preference.EL_CLASS = 'preference__el';
 Preference.TYPE = null; // Has to be set by subclass
diff --git a/src/ui-preferences/PreferenceGroup.js b/src/ui-preferences/PreferenceGroup.js
index fedfb36..1c34b70 100644
--- a/src/ui-preferences/PreferenceGroup.js
+++ b/src/ui-preferences/PreferenceGroup.js
@@ -1,6 +1,7 @@
 import Preference from './Preference';
 import {createEl, qs} from './utils';
 import template from '!!raw-loader!./templates/PreferenceGroup.html';
+import toggleTemplate from '!!raw-loader!./templates/toggle.html';
 
 /**
  * Groups preferences together and displays them in a manner to reflect that fact.
@@ -27,22 +28,26 @@ export default class PreferenceGroup extends Preference {
     }
     this._preferences = preferences;
     this._toggleable = toggleable;
-    if(this._toggleable){
-      this.$container.classList.add('pref-group_toggable');
+    if (this._toggleable) {
+      this.$container.classList.add('pref-group--toggable');
     }
   }
 
-  _buildContainerEl() {
-    return createEl(template);
+  _buildEl() {
+    const $toggle = createEl(toggleTemplate);
+    qs('.pref-group__toggle', this.$container).appendChild($toggle);
+    return $toggle.querySelector('.toggle__checkbox');
   }
 
-  _buildEl() {
-    return this.$container.querySelector(`.${PreferenceGroup.EL_CLASS}`);
+  _onChange(newValue) {
+    this.$container.classList.toggle('pref-group--active', newValue);
+    super._onChange(newValue);
   }
 
   async fillContainer() {
-    qs('.pref-group__label', this.$container).innerHTML = this.label;
-    qs('.pref-group__description', this.$container).innerHTML = this.description;
+    const $label = qs('.pref-group__label', this.$container);
+    $label.innerHTML = this.label;
+    this._addDescription($label);
     this._fillDocLink();
     this._createOnChange('change');
     const $preferences = this.$container.querySelector('.preferences');
@@ -68,6 +73,7 @@ export default class PreferenceGroup extends Preference {
   set({value}) {
     if (this._toggleable) {
       this.el.checked = value;
+      this.$container.classList.toggle('pref-group--active', value);
       super.set({value});
     }
   }
@@ -85,5 +91,5 @@ export default class PreferenceGroup extends Preference {
   }
 }
 
+PreferenceGroup.TEMPLATE = template;
 PreferenceGroup.TYPE = 'group';
-PreferenceGroup.EL_CLASS = 'pref-group__toggle';
diff --git a/src/ui-preferences/index.html b/src/ui-preferences/index.html
index 6b39959..f97735f 100644
--- a/src/ui-preferences/index.html
+++ b/src/ui-preferences/index.html
@@ -7,7 +7,7 @@
     <script type="module" src="index.js"></script>
 </head>
 <body>
-
+<h1>Preferences</h1>
 <div class="preferences-container">
 
 </div>
diff --git a/src/ui-preferences/index.js b/src/ui-preferences/index.js
index 9e9fcb6..1f8952b 100644
--- a/src/ui-preferences/index.js
+++ b/src/ui-preferences/index.js
@@ -1,5 +1,6 @@
 import './styles/index.scss';
 import './index.html';
+import './InfoTooltip';
 import preferencesJson from './preferences.json';
 import BooleanPreference from './BooleanPreference';
 import ChoicePreference from './ChoicePreference';
diff --git a/src/ui-preferences/styles/ContainerPreference.scss b/src/ui-preferences/styles/ContainerPreference.scss
new file mode 100644
index 0000000..eff6397
--- /dev/null
+++ b/src/ui-preferences/styles/ContainerPreference.scss
@@ -0,0 +1,9 @@
+.pref-container {
+  margin: 5px;
+  flex-grow: 1;
+}
+
+.pref-container > .preferences {
+  display: flex;
+  flex-direction: column;
+}
diff --git a/src/ui-preferences/styles/ContainerPreferenceGroup.scss b/src/ui-preferences/styles/ContainerPreferenceGroup.scss
new file mode 100644
index 0000000..10d7168
--- /dev/null
+++ b/src/ui-preferences/styles/ContainerPreferenceGroup.scss
@@ -0,0 +1,5 @@
+.pref-group.pref-containers > .preferences{
+  margin: 0;
+  display: flex;
+  flex-wrap: wrap;
+}
diff --git a/src/ui-preferences/styles/InformationElement.css b/src/ui-preferences/styles/InformationElement.css
new file mode 100644
index 0000000..1a84c6f
--- /dev/null
+++ b/src/ui-preferences/styles/InformationElement.css
@@ -0,0 +1,55 @@
+:host {
+    --size: 15px;
+    all: initial;
+}
+
+:host([text='']) {
+    display: none;
+}
+
+.wrapper {
+    position: relative;
+    display: inline-flex;
+    vertical-align: top;
+}
+
+.icon {
+    text-shadow: blue 5px 2px 5px;
+    position: relative;
+    font-style: oblique;
+    color: white;
+    border-color: white;
+    border-width: 1px;
+    border-style: solid;
+    background: cadetblue;
+    border-radius: var(--size);
+    line-height: var(--size);
+    font-size: var(--size);
+    width: var(--size);
+    height: var(--size);
+    text-align: center;
+    padding: 1px;
+}
+
+
+.info {
+    font-size: 0.8rem;
+    width: 200px;
+    display: inline-block;
+    border: 1px solid black;
+    padding: 10px;
+    background: black;
+    color: beige;
+    border-radius: 10px;
+    opacity: 0;
+    transition: 0.6s all;
+    position: absolute;
+    bottom: 20px;
+    left: 10px;
+    z-index: 3;
+    pointer-events: none;
+}
+
+.icon:hover + .info, .icon:focus + .info {
+    opacity: 1;
+}
diff --git a/src/ui-preferences/styles/index.scss b/src/ui-preferences/styles/index.scss
index e01e091..360df90 100644
--- a/src/ui-preferences/styles/index.scss
+++ b/src/ui-preferences/styles/index.scss
@@ -1,26 +1,33 @@
 // BEM is used for classes
 // https://en.bem.info/methodology/quick-start/
+@import "toggle";
+@import "ContainerPreference";
+@import "ContainerPreferenceGroup";
 
 body {
   display: flex;
-  flex-direction: row;
+  flex-direction: column;
 }
 
-.pref-container {
+.preference {
   position: relative;
   border-width: 1px;
   border-radius: 3px;
   border-style: dashed;
   margin-bottom: 5px;
   margin-top: 5px;
-  padding-left: 2px;
-  padding-right: 2px;
+  padding: 2px;
 }
 
-.pref-container .pref-container__label {
+.preference .preference__label {
   font-weight: bold;
 }
 
+.preference .pref-el-container {
+  display: flex;
+  flex-direction: column;
+}
+
 .pref-doc {
   position: absolute;
   right: 5px;
@@ -55,26 +62,40 @@ body {
   padding-right: 2px;
 }
 
-.pref-group__toggle {
-  display: none;
+.pref-group .preferences {
+  margin-left: 10px;
 }
 
+
 .pref-group__label {
   font-weight: bolder;
   font-size: large;
 }
 
-.pref-group_toggable .pref-group__toggle {
+.pref-group__toggle {
+  display: none;
+}
+
+.pref-group--toggable .pref-group__toggle {
   display: unset;
 }
 
 // Groups that aren't activated yet
-.pref-group_toggable .pref-group__toggle ~ .preferences {
+.pref-group--toggable .preferences {
   opacity: 0.5;
+}
+
+.pref-group--toggable .preferences * {
   pointer-events: none;
 }
+
 // Activated groups
-.pref-group_toggable .pref-group__toggle:checked ~ .preferences {
-  opacity: unset;
+.pref-group--toggable.pref-group--active .preferences * {
   pointer-events: unset;
 }
+
+.pref-group--toggable.pref-group--active .preferences {
+  opacity: unset;
+}
+
+
diff --git a/src/ui-preferences/styles/toggle.scss b/src/ui-preferences/styles/toggle.scss
new file mode 100644
index 0000000..8f72532
--- /dev/null
+++ b/src/ui-preferences/styles/toggle.scss
@@ -0,0 +1,38 @@
+.toggle {
+  position: relative;
+  height: 20px;
+  width: 50px;
+  border-radius: 20px;
+  border-color: black;
+  border-style: groove;
+}
+
+.toggle__checkbox {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  opacity: 0;
+  margin: 0;
+  padding: 0;
+}
+
+.toggle__circle {
+  height: 12px;
+  width: 12px;
+  border-radius: 12px;
+  border-width: 1px;
+  border-style: ridge;
+  background-color: grey;
+  margin-top: 1px;
+  margin-bottom: 1px;
+  margin-left: 2px;
+  transition-property: margin-left, background-color;
+  transition-duration: 1s;
+}
+
+.toggle .toggle__checkbox:checked ~ .toggle__circle {
+  background-color: blue;
+  margin-left: 30px;
+}
diff --git a/src/ui-preferences/templates/Preference.html b/src/ui-preferences/templates/Preference.html
index ab17b53..6840807 100644
--- a/src/ui-preferences/templates/Preference.html
+++ b/src/ui-preferences/templates/Preference.html
@@ -1,9 +1,9 @@
-<div class="pref-container">
+<div class="preference">
     <a class="pref-doc"></a>
-    <div class="pref-container__label"></div>
-    <div class="pref-container__description"></div>
+    <div class="preference__label"></div>
+    <div class="preference__description"></div>
 
     <div class="pref-el-container">
-        <!-- Put the pref-container__el in here -->
+        <!-- Put the preference__el in here -->
     </div>
 </div>
diff --git a/src/ui-preferences/templates/PreferenceGroup.html b/src/ui-preferences/templates/PreferenceGroup.html
index eeec898..f310dc9 100644
--- a/src/ui-preferences/templates/PreferenceGroup.html
+++ b/src/ui-preferences/templates/PreferenceGroup.html
@@ -1,13 +1,13 @@
 <div class="pref-group">
     <a class="pref-doc"></a>
-    <div class="pref-group__label">
-    </div>
-    <div class="pref-group__description">
+    <span class="pref-group__label">
+    </span>
+
+    <div class="pref-group__toggle">
     </div>
 
-    <input
-        class="pref-group__toggle"
-        type="checkbox">
+    <div class="pref-group__label">
+    </div>
 
     <div class="preferences">
 
diff --git a/src/ui-preferences/templates/toggle.html b/src/ui-preferences/templates/toggle.html
new file mode 100644
index 0000000..6fa7d4b
--- /dev/null
+++ b/src/ui-preferences/templates/toggle.html
@@ -0,0 +1,4 @@
+<div class="toggle">
+  <input type="checkbox" class="toggle__checkbox">
+  <div class="toggle__circle"></div>
+</div>