Comment layouts

Let's merge this.