#966: #867: added comment anchor + fixed margin position
opened by njr2128