correct comment alignment and link ordering