Block controls

![screen shot 2014-02-26 at 9 28 26](https://f.cloud.github.com/assets/111218/2273022/70c42d54-9f0b-11e3-9e80-8ec61b8a9992.png)


Fixes #292 and #342