More layout fixes for comments