fixes #332, #334 and other visual glitches

![snapshot12](https://cloud.githubusercontent.com/assets/4587853/4434789/4361e42e-4725-11e4-9d20-63b391ddc77d.png)