Dfoxpowell/bug cleanup 2

2nd round of bug fixes
can you take a look at the use of `<wbr>` and `white-space: no-wrap` in [this article](http://www.cssmojo.com/wbr-versus-br/) to see if it's a better solution than this br tag with multiple classes?