404

This should auto merge after merging 355 and 375 or it will include both.

This should be thoroughly tested. There are other strange things related to smart-admin and overflows.

![screenshot-2014-09-02-13 58 42](https://cloud.githubusercontent.com/assets/8549493/4123356/5ee5310e-32cd-11e4-8807-c339802361d4.png)