diff --git a/README.md b/README.md
index 4639b62f9..44b608e0c 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,29 @@
 qTox
 ======
 
-qTox is a powerful Tox client that tries to follow the Tox design guidelines while running on all major platforms. <br/>
+ [**Compiling**](/INSTALL.md) **|** [**Contributing**](https://github.com/tux3/qTox/wiki#contributing) **|** [**Reporting bugs**](https://github.com/tux3/qTox/wiki/Useful-bug-reports) **|** [**Translating**](https://github.com/tux3/qTox/wiki/Translating) **|** [**GitStats**](https://tux3-dev.tox.im/) **|** [**Mac & Linux jenkins**](https://jenkins.libtoxcore.so/user/tux3/my-views/view/qTox/) | [**Windows jenkins**](https://tux3-dev.tox.im/jenkins) **|** [**Keyboard shortcuts**](https://github.com/tux3/qTox/wiki/Keyboard-shortcuts) **|** [**Mailing list**](https://lists.tox.im) **|** **IRC Channel:** [#tox@freenode](https://webchat.freenode.net/?channels=tox)
 
-<h2>Features</h2>
+====
+
+<h5>qTox is a powerful Tox client that tries to follow the Tox design guidelines while running on all major platforms:</h5>
+
+* **Windows**:
+  - [**64 bit download**](https://tux3-dev.tox.im/jenkins/job/qTox-win64-nsis/lastSuccessfulBuild/artifact/setup-qtox64.exe)
+  - [**32 bit download** (for older hardware)](https://tux3-dev.tox.im/jenkins/job/qTox-win32-nsis/lastSuccessfulBuild/artifact/setup-qtox32.exe)
+* **Linux**:
+  - [**binary**](https://jenkins.libtoxcore.so/job/qTox-linux-amd64/lastSuccessfulBuild/artifact/qt/qtox.xz)
+  - [**packages**](https://jenkins.libtoxcore.so/job/qTox-Linux-pkg/lastSuccessfulBuild/artifact/)
+  - [**Gentoo overlay**](https://github.com/Tox/gentoo-overlay-tox)
+* **Mac**: [**download**](https://dist-build.tox.im/qtox/osx/qtox.zip)<br/>
+
+
+<h4>Screenshots</h4>
+Note: The screenshots may not always be up to date, but they should give a good idea of the general look and features
+<img src="http://i.imgur.com/hwGmDeK.png"/>
+<img src="http://i.imgur.com/tmX8z9s.png"/>
+
+
+<h4>Features</h4>
 
 - One to one chat with friends
 - Group chats
@@ -13,32 +33,9 @@ qTox is a powerful Tox client that tries to follow the Tox design guidelines whi
 - Tox DNS and Tox URI support
 - Translations in various languages
 - Avatars
+- Faux offline messages
+- History
+- Screenshots
+- Emoticons
 - Auto-updates on Windows and Mac, packages on Linux
-- And many more options!
-
-<h2>Downloads</h2>
-
-This client runs on Windows, Linux and Mac natively.<br/>
-
-
-<a href="https://tux3-dev.tox.im/jenkins/job/qTox-win64-nsis/lastSuccessfulBuild/artifact/setup-qtox64.exe">Windows 64 bit download</a><br/>
-<a href="https://tux3-dev.tox.im/jenkins/job/qTox-win32-nsis/lastSuccessfulBuild/artifact/setup-qtox32.exe">Windows 32 bit download (for older hardware)</a><br/>
-<a href="https://dist-build.tox.im/qtox/osx/qtox.zip">OS X download </a><br/>
-<a href="https://jenkins.libtoxcore.so/job/qTox-linux-amd64/lastSuccessfulBuild/artifact/qt/qtox.xz">Linux binary download</a><br/>
-<a href="https://jenkins.libtoxcore.so/job/qTox-Linux-pkg/lastSuccessfulBuild/artifact/">Linux packages</a><br/>
-
-<h3>Screenshots</h3>
-<h5>Note: The screenshots may not always be up to date, but they should give a good idea of the general look and features</h5>
-<img src="http://i.imgur.com/hwGmDeK.png"/>
-<img src="http://i.imgur.com/tmX8z9s.png"/>
-
-##Documentation:
-
-[Compiling](/INSTALL.md)
-
-##Developer overview:
-
-[Contributing](https://github.com/tux3/qTox/wiki#contributing)<br/>
-[GitStats](https://tux3-dev.tox.im/)<br/>
-[Mac & Linux jenkins](https://jenkins.libtoxcore.so/user/tux3/my-views/view/qTox/)<br/>
-[Windows jenkins](https://tux3-dev.tox.im/jenkins)<br/>
+- And many more options!
\ No newline at end of file