Comment layout improved