Fix layout issue on WP3.8+

Hi there,

There are some issues with custom controls (Layout + Colors) on WP3.8 and 3.9.

![cazuela-master](https://f.cloud.github.com/assets/1778633/1970957/564db6fa-831a-11e3-8fbe-bcb9626e4e3d.png)

Not sure it's the best way to fix it but it seems to work okay.