Squashed commit of the following:

commit c52c92b4d79a415d51cf893ef988a70e493e813a
Author: Leo Picado <leopic@gmail.com>
Date:   Sat Mar 1 11:38:28 2014 -0600

    Design tweaks.