Issue31 Fix button overlap

Fixes #31 
![tc9](https://cloud.githubusercontent.com/assets/3061095/5233413/b200644a-77a5-11e4-89d9-83c6038dc4c8.png)