Squashed commit of the following:

commit c26bd77a8ba35b59df3da8e06674f370586a0af3
Author: Michael Wallasch <michael.wallasch@googlemail.com>
Date:   Sat Jul 6 00:42:39 2013 +0200

    Fit links in one line on mobile