[#2] Additional Information collapse and ordering tweaks