Changed the commenting layout again.

Should look something like this, but I haven't been able to run it so please verify before merging. 
![Screenshot from 2013-02-10 17:05:52](https://f.cloud.github.com/assets/882381/144047/a310323a-73e7-11e2-8e06-f28e6dc7dc62.png)