Fix controls padding

scope of this.currentWidth
![image](https://cloud.githubusercontent.com/assets/1194048/5226578/cc98b678-76f0-11e4-8d09-795945a9a9ce.png)

Controls are considered in the correct position:
![image](https://cloud.githubusercontent.com/assets/1194048/5226381/6f0ea0b4-76ee-11e4-9688-e32940c8a83f.png)

This should fix #1558 and #1551