comment layout fixes