Various fixes for non retina displays

* fixes #18
* fixes #19