php variable injection removal

and widget labeling cleanup

then 


![then](https://f.cloud.github.com/assets/1410427/2222596/d8d67d14-9a67-11e3-849a-6599e46529ae.png)

and now

![now](https://f.cloud.github.com/assets/1410427/2222597/db38556e-9a67-11e3-8d8a-74aca08dd945.png)