Commercial: Fix position of container's advertisement feature badge

And general tidy up of templates

### Before

![screen shot 2014-06-06 at 12 22 46](https://cloud.githubusercontent.com/assets/74132/3199645/ed9bd106-ed6c-11e3-805a-0b806b875860.png)

### After

![screen shot 2014-06-06 at 12 22 51](https://cloud.githubusercontent.com/assets/74132/3199647/f2f6b4cc-ed6c-11e3-956e-4fdb62dce13d.png)
Does types ever contain spaces?