diff --git a/site/index.md b/site/index.md
index 404db7c76..517152451 100644
--- a/site/index.md
+++ b/site/index.md
@@ -1,4 +1,33 @@
-# hledger docs
+---
+title: home
+...
+
+<style>
+ .highslide img {max-width:200px; float:right; margin:0 0 1em 1em;}
+ .highslide-caption {color:white; background-color:black;}
+ a {white-space:nowrap;}
+</style>
+
+<img src="/images/coins2-248.png" width="" height="200" style="float:right; margin:1em 1em 0 1em;" />
+<h1 style="/*font-size:4em;*/ ">hledger</h1>
+<span style="font-size:xx-large;">
+Friendly, robust, plain text accounting.
+<!-- Robust, powerful, plain text accounting. -->
+<!-- Robust, precise, plain text accounting. -->
+<!-- Plain text accounting for everyone. -->
+<!-- Making accounting fun for techies. -->
+</span>
+
+<span style="font-size:x-large;">hledger</span> is an accounting program, for tracking money, time, or
+other commodities, on unix, mac and windows. 
+
+With simple yet powerful functionality accessed from command line, terminal or web browser, 
+it is a dependable, cross-platform alternative to Quickbooks, GnuCash, spreadsheets etc.
+
+The hledger project is led by Simon Michael.
+I've been using and improving hledger since 2007.
+I hope it will keep growing and helping more of us to master our time and money.
+If you feel the same way, join us!
 
 <style>
 h2 { font-size:x-large; margin-top:.5em; }
@@ -9,12 +38,12 @@ td:nth-child(1) { padding-right:1em; white-space:nowrap; }
   padding:0;
 }
 .contentbox {
+  margin:1em .5em .5em 0;
   padding:.1em .5em;
-  margin:0 .5em .5em 0;
   border-radius:1em;
 }
 #introduction {
-  background-color:#ffd;
+/*  background-color:#ffb; */
 }
 #help {
   background-color:#fdd;
@@ -44,7 +73,7 @@ td:nth-child(1) { padding-right:1em; white-space:nowrap; }
 ### What is hledger?
 
 An enhanced, well-documented reimplementation of plain text accounting.\
-**[hledger intro](http://hledger.org)**
+**[What is hledger ?](intro.html)**
 
 ### What is plain text accounting?
 
@@ -54,7 +83,7 @@ Using plain text data formats and version control for robust, transparent accoun
 ### What is accounting?
 
 Tracking your use of valuable commodities, such as money or time, for increased awareness and effectiveness.\
-**[Selected accounting links](http://github.com/simonmichael/hledger/wiki/more-docs)**
+**[Selected accounting links](http://github.com/simonmichael/hledger/wiki/more-docs#accounting)**
 </div>
 
 <div id=help class=contentbox>
@@ -63,9 +92,9 @@ Tracking your use of valuable commodities, such as money or time, for increased
 |
 |-------------------|----------------------------------------------------------------------------|
 | IRC:              | [#hledger](http://irc.hledger.org) on Freenode <!-- [chat log](http://ircbrowse.net/browse/hledger); --> <!-- see also [#ledger](http://webchat.freenode.net?channels=ledger&randomnick=1) --> <!-- *Quick help and background chat.* --> <!-- *If you don't get an answer promptly, you can type `sm` to alert me, or leave the window open and check back later.* -->
-| Twitter:          | [#hledger](https://twitter.com/search?q=%23hledger&src=typd&f=realtime), [#plaintextaccounting](https://twitter.com/search?q=%23plaintextaccounting&src=typd&f=realtime) <!-- <a href="https://twitter.com/ledgertips">@LedgerTips</a> --> <!-- *Social!* -->
+| Twitter:          | [#hledger,<br>#plaintextaccounting](#twitter) <!-- *Social!* -->
 | Reddit:           | [/r/plaintextaccounting](https://www.reddit.com/r/plaintextaccounting/)
-| Mail list:     | [list.hledger.org](http://list.hledger.org), [hledger@googlegroups.com](mailto:hledger@googlegroups.com) <!-- *Slightly less quick, more eyeballs.* -->
+| Mail list:        | [list.hledger.org](http://list.hledger.org), [hledger@googlegroups.com](mailto:hledger@googlegroups.com) <!-- *Slightly less quick, more eyeballs.* -->
 | Issue<br>tracker: | [bugs.hledger.org](http://bugs.hledger.org)&nbsp;(bugs), [issues.hledger.org](http://issues.hledger.org)&nbsp;(all) <!-- *Always check here.* --> <!-- *Bug reports are welcome.* -->
 | Other:            | [simon@joyful.com](mailto:simon@joyful.com)
 <!-- | hledger-web demo&nbsp;&nbsp; | [demo.hledger.org](http://demo.hledger.org) -->
@@ -176,3 +205,20 @@ a file format for human-friendly approximate time logging
 </div> <!-- column -->
 </div> <!-- row -->
 </div> <!-- container -->
+
+
+<div style="margin-top:4em; text-align:center; ">
+<a name="twitter"></a>
+
+## [#hledger](https://twitter.com/search?q=%23hledger&src=typd&f=realtime), [#plaintextaccounting](https://twitter.com/search?q=%23plaintextaccounting&src=typd&f=realtime) on Twitter:
+
+<!-- <a href="https://twitter.com/ledgertips">@LedgerTips</a> -->
+<style>
+ .twitter-timeline {
+   height: 1500px !important;
+   /* width: 70% !important; */
+ }
+</style>
+<a class="twitter-timeline" data-chrome="noheader" data-dnt="true" href="https://twitter.com/search?q=%23hledger%20OR%20%23plaintextaccounting%20-RT%20-%23TheJoker" data-widget-id="707934052225945600">Tweets about #hledger OR #plaintextaccounting OR #ledgercli -RT -#TheJoker</a> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+
+</div>
diff --git a/site/intro.md b/site/intro.md
index 364e6a494..a156c0789 100644
--- a/site/intro.md
+++ b/site/intro.md
@@ -1,5 +1,5 @@
 ---
-title: home
+title: intro
 ...
 
 <style>
@@ -7,42 +7,23 @@ title: home
  .highslide-caption {color:white; background-color:black;}
  a {white-space:nowrap;}
 </style>
-<style media="screen and (min-width:1020px) and (orientation: landscape)">
+<style media="screen and (min-width:800px) and (orientation: landscape)">
  .indent0 { margin:0 15em 0  0em; }
  .indent1 { margin:0 10em 0  5em; }
  .indent2 { margin:0  5em 0 10em; }
  .indent3 { margin:0    0 0 15em; }
 </style>
 
-<!-- funding buttons -->
-<div style="text-align:right; width:100%;">
-[![github](https://img.shields.io/github/stars/simonmichael/hledger.svg?style=social&label=Github){style="min-width:102;" title="Star us!"}](https://github.com/simonmichael/hledger/)
-<a href="https://opencollective.com/hledger#support"><img border="0" src="https://opencollective.com/hledger/backers/badge.svg" title="Back us with a monthly donation at Open Collective" alt="open collective backers"></a>
-<a href="https://opencollective.com/hledger#support"><img border="0" src="https://opencollective.com/hledger/sponsors/badge.svg" title="Sponsor us with a $100+ monthly donation at Open Collective and get your organization's logo on our README" alt="open collective sponsors"></a>
-<a href="https://flattr.com/submit/auto?user_id=simonmichael&amp;url=http%3A%2F%2Fhledger.org" target="_blank"><img border="0" src="//api.flattr.com/button/flattr-badge-large.png" alt="" title="Give monthly with Flattr" alt="flattr"></a>
-<a href="https://www.bountysource.com/trackers/536505-simonmichael-hledger"><img border=0 src="https://www.bountysource.com/badge/tracker?tracker_id=536505" title="Contribute or claim issue bounties via Bountysource" alt="bountysource"></a>
-<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=5J33NLXYXCYAY"><img width=62 height=31 border=0 src="https://www.paypal.com/en_US/i/btn/x-click-but04.gif" title="Give one time or recurringly with Paypal" alt="paypal"></a>
-</div>
-
 <!-- main content -->
 
-<h1 style="font-size:4em;">hledger</h1>
+## What is hledger ?
 
-<img src="/images/coins2-248.png" width="" height="200" style="float:right; margin:1em 1em 0 1em;" />
+It's a [plain text accounting](http://plaintextaccounting.org) program, 
+for tracking money, time, or other commodities, 
+on unix, mac and windows. 
 
-<h2 style="margin-top:0; margin-bottom:.5em;">
-<!-- Making accounting fun for techies. -->
-<!-- Plain text accounting for everyone. -->
-<!-- Robust, precise, plain text accounting. -->
-Robust, powerful, plain text accounting.
-</h2>
-
-<div style="font-size:medium;">
-
-hledger is an accounting program, for tracking money, time, or
-other commodities, on unix, mac and windows. With simple yet powerful
-functionality accessed from command line, terminal or web browser, it is a
-dependable, cross-platform alternative to Quicken, GnuCash, spreadsheets etc.
+With simple yet powerful functionality accessed from command line, terminal or web browser, 
+it is a dependable, cross-platform alternative to Quickbooks, GnuCash, spreadsheets etc.
 
 <div class="indent0">
 ### plain text ? How does that work ?
@@ -97,7 +78,7 @@ Read more about the differences in the [FAQ](https://github.com/simonmichael/hle
 
 </div>
 
-<div class="indent0">
+<div class="indent1">
 ### a command-line tool, that respects your data
 
 <a href="images/balance-q-inc.png" class="highslide" onclick="return hs.expand(this)"><img src="images/balance-q-inc.png" title="Balance report showing income/expense by quarter" /></a>
@@ -110,7 +91,7 @@ transactions, but does not change existing ones.)
 </div>
 
 <a name="and-a-console-ui"></a>
-<div class="indent1">
+<div class="indent0">
 ### a console UI
 
 <a href="images/hledger-ui/hledger-ui-bcexample-acc.png" class="highslide" onclick="return hs.expand(this)"><img src="images/hledger-ui/hledger-ui-bcexample-acc.png" title="hledger-ui accounts screen" /></a>
@@ -119,7 +100,7 @@ that lets you review account balances and transactions quickly and without fuss.
 ([screencast](https://asciinema.org/a/29665))
 </div>
 
-<div class="indent2">
+<div class="indent1">
 ### a web UI
 
 <a href="images/hledger-web/normal/register.png" class="highslide" onclick="return hs.expand(this)"><img src="images/hledger-web/normal/register.png" title="Account register view with accounts sidebar" /></a>
@@ -132,7 +113,7 @@ at
 [Sandstorm](https://apps.sandstorm.io/app/8x12h6p0x0nrzk73hfq6zh2jxtgyzzcty7qsatkg7jfg2mzw5n90).
 </div>
 
-<div class="indent3">
+<div class="indent2">
 ### a Haskell application and library
 
 <a href="images/hledger-lib-api.png" class="highslide" onclick="return hs.expand(this)"><img src="images/hledger-lib-api.png" title="Part of hledger-lib's haddock api documentation" /></a>
@@ -160,6 +141,13 @@ applications.
 <!-- folk as well. -->
 <!-- </div> -->
 
+<div class="indent1">
+### fully documented
+
+We practice documentation-driven development. Every feature must be **[well documented](index2.html)**, and getting started must be easy.
+
+</div>
+
 <div class="indent0">
 ### focussed on serving users
 
@@ -169,28 +157,5 @@ Currently it is particularly suited to techies, ie users who appreciate the
 power of text files, revision control, scriptability and double entry
 accounting.
 
-I've been using hledger daily and improving it since 2007.
-I needed a tool like this badly, and I hope it will keep growing and
-helping folks to transform their financial lives.
-If you feel the same way, join us!
-
 </div>
 
-<div class="indent1">
-### fully documented
-
-Time to check out those **[docs](docs.html)**!
-
-</div>
-
-</div>
-<!-- end of main content -->
-
-<div style="margin-top:4em; text-align:center; ">
-<div>
-#### Tweets (#hledger OR #plaintextaccounting OR #ledgercli):
-<a class="twitter-timeline" data-chrome="noheader" data-dnt="true" href="https://twitter.com/search?q=%23hledger%20OR%20%23plaintextaccounting%20OR%20%23ledgercli%20-RT%20-%23TheJoker" data-widget-id="707934052225945600">Tweets about #hledger OR #plaintextaccounting OR #ledgercli -RT -#TheJoker</a> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
-</div>
-
-<!-- something to do with the github/stars button, any benefit ? -->
-<!-- <script async defer src="https://buttons.github.io/buttons.js"></script> -->