Align comment section, add icon
.
assorted modifications