diff --git a/configs/atom.ini b/configs/atom.ini
index bc16e0e..b1028c0 100644
--- a/configs/atom.ini
+++ b/configs/atom.ini
@@ -4,8 +4,8 @@ source_path = /u/blog
filename = feed.xml
item_model = blog-post
-[products]
-name = ungleich products
-source_path = /u/products
-filename = feed.xml
-item_body_field = description
+# [products]
+# name = ungleich products
+# source_path = /u/products
+# filename = feed.xml
+# item_body_field = description
diff --git a/content/u/products/data-storage/contents.lr b/content/u/products/data-storage/contents.lr
new file mode 100644
index 0000000..d0c8b81
--- /dev/null
+++ b/content/u/products/data-storage/contents.lr
@@ -0,0 +1,36 @@
+_discoverable: yes
+---
+_hidden: no
+---
+title: Data Storage
+---
+subtitle: Stored safely in Switzerland
+---
+feature1_title: Neutral
+---
+feature1_text:
+Switzerland is a neutral country and politically stable.
+---
+feature3_title: Safe
+---
+feature3_text:
+Switzerland has strong privacy laws and we protect your data.
+---
+feature2_title: Sustainable & Renewable energy
+---
+feature2_text: Our data center is built on core concepts
+of sustainability and only uses 100% renewable energy.
+Read more about [how to sustainable store your data](https://ungleich.ch/u/blog/how-to-sustainable-store-your-data/).
+---
+description2:
+We offer a variety of methods to store your data safely in
+Switzerland. [Glarnercloud](https://glarnercloud.ch) is our Nextcloud
+based offer to allow an easy way of storing your data and
+synchronising it with all your devices.
+
+Alternatively you can also manage your own
+[virtual machine](https://datacenterlight.ch), it is even possible to
+do this with an [IPv6 only VM](https://ipv6onlyhosting.com).
+
+We also have a beta program for S3 compatible storage. Send a mail
+to support at ungleich.ch if you are interested in using it.
diff --git a/content/u/products/ipv6-only-hosting/contents.lr b/content/u/products/ipv6-only-hosting/contents.lr
index ac3f249..389c8f5 100644
--- a/content/u/products/ipv6-only-hosting/contents.lr
+++ b/content/u/products/ipv6-only-hosting/contents.lr
@@ -6,4 +6,33 @@ _discoverable: yes
---
_hidden: no
---
-subtitle: We provide best IPv6 only hosting
+subtitle: Future ready, today.
+---
+feature1_title: Necessary
+---
+feature1_text: We [ran out of IPv4
+space](https://www.ripe.net/publications/news/about-ripe-ncc-and-ripe/the-ripe-ncc-has-run-out-of-ipv4-addresses)
+by the end of 2019. While you can acquire IPv4 space on the market, it
+is very expensive and effectively limiting new projects to come into
+existence. IPv6 fixes all of this, today.
+---
+feature2_title: Sustainable & Simple
+---
+feature2_text: Compared to IPv4 only or Dual Stack VMs, IPv6 only VMs
+are the only ones really ready for the future. IPv4 only VMs already
+today face the problem that they cannot reach resources in the IPv6
+Internet. Dual stack VMs are increasing complexity and difficulty,
+especially when it comes to firewall rules and security.
+---
+feature3_title: Connected
+---
+feature3_text:
+Even with IPv6 only VMs you are not isolated from the legacy (IPv4)
+Internet. Our
+[DNS64](https://redmine.ungleich.ch/projects/open-infrastructure/wiki/The_ungleich_DNS_infrastructure)
+and
+[NAT64](https://redmine.ungleich.ch/projects/open-infrastructure/wiki/The_ungleich_network_infrastructure#IPv6-NAT64)
+services allow your VM to connect to anywhere in the legacy
+Internet. And even the legacy Internet can connect to you, using an
+[IPv4-to-IPv6 proxy](https://redmine.ungleich.ch/projects/open-infrastructure/wiki/How_to_use_the_IPv4-to-IPv6-Proxy)!
+---
diff --git a/content/u/products/storage-glarnercloud/contents.lr b/content/u/products/storage-glarnercloud/contents.lr
deleted file mode 100644
index 1b9572f..0000000
--- a/content/u/products/storage-glarnercloud/contents.lr
+++ /dev/null
@@ -1,20 +0,0 @@
-_discoverable: yes
----
-_hidden: no
----
-title: Cloud Storage
----
-subtitle: Stored safely in Switzerland
----
-feature1_title: Neutral
----
-feature1_text: The text for the first feature
----
-feature2_title: Safe
----
-feature2_text: The text for second feature
----
-feature3_title: Renewable
----
-feature3_text: The text for the third feature
----
diff --git a/content/u/products/virtual-machine-hosting/contents.lr b/content/u/products/virtual-machine-hosting/contents.lr
index aa073d6..cb75b5d 100644
--- a/content/u/products/virtual-machine-hosting/contents.lr
+++ b/content/u/products/virtual-machine-hosting/contents.lr
@@ -6,3 +6,52 @@ title: Virtual Machine Hosting
---
subtitle: Sustainable, green and safe
---
+feature1_title: Full virtualisation
+---
+feature1_text: All our virtual machines use full virtualisation. This
+way we can offer a variety of different operating systems that would
+not be possible with container technologies alone.
+
+Full virtualisation also protects your VM from other customers and
+properly controls resource consumption.
+---
+feature2_title: Redundancy, redundancy, redundancy!
+---
+feature2_text: Every data block of every virtual machine is saved
+three times on three different computers. This way if one or even two
+storage nodes fail at the same time, no data is lost. The underlying
+technology we use is [CEPH](https://ceph.com).
+
+We also offer to create special backup VMs in a geolocation different
+data center so that even if a disaster case you still have a backup of
+your data.
+---
+feature3_title: Scalable
+---
+feature3_text: It is easy to start small and to grow your VM over
+time. And you can grow quite far:
+You need 64 cores in one VM? We have it. You need 1 TB of RAM in a VM?
+We have it. You need 1 PB (1024 TB) Storage in your VM? You get it.
+---
+description2:
+As you might know, all our data centers are built upon the principle
+of sustainability. We reuse old factory halls, we acquire used
+hardware (with fresh SSDs and fresh HDDs), we produce our own
+electricity locally.
+
+And importantly: we don't cool our servers. Instead we give each
+server enough space to breath (on average: 4 square meters).
+
+We have two different virtual machine offers:
+
+* [The future guiding IPv6 only hosting](https://ipv6onlyhosting.com)
+* [The traditional dual stack hosting on DataCenterLight.ch](https://datacenterlight.ch)
+
+The difference between them is that the **IPv6 Only hosting** comes
+without IPv4 addresses and has a lower pricing. The lower pricing
+comes from the scarcity of IPv4 addresses: there is only a very limited
+pool of IPv4 addresses.
+
+Both offers include an optional /64 IPv6 network that you receive on
+request and both offers can also be extended with HDD storage for 1.5
+CHF/month per 100 GB storage.
diff --git a/models/product.ini b/models/product.ini
index 65d17b2..12211ce 100644
--- a/models/product.ini
+++ b/models/product.ini
@@ -12,8 +12,12 @@ size = large
label = Subtitle
type = string
-[fields.description]
-label = Description
+[fields.description1]
+label = Description 1
+type = markdown
+
+[fields.description2]
+label = Description 2
type = markdown
[fields.link]
@@ -35,15 +39,15 @@ type = string
[fields.feature1_text]
label = Feature1 Text
-type = text
+type = markdown
[fields.feature2_text]
label = Feature2 Text
-type = text
+type = markdown
[fields.feature3_text]
label = Feature3 Text
-type = text
+type = markdown
[fields.content1_text]
label = Content1 Text
diff --git a/models/products.ini b/models/products.ini
index 10a2c89..31b271f 100644
--- a/models/products.ini
+++ b/models/products.ini
@@ -12,4 +12,5 @@ label = Subtitle
type = string
[children]
-model = product
\ No newline at end of file
+model = product
+order_by = title
\ No newline at end of file
diff --git a/templates/product.html b/templates/product.html
index 3add56e..ba07a87 100644
--- a/templates/product.html
+++ b/templates/product.html
@@ -3,11 +3,11 @@
{% block subtitle %}{{ this.subtitle }}{% endblock %}
{% block content %}
-{% if this.description %}
+{% if this.description1 %}