GCP-7843 Re-arrange info in Basic Details section based on mockup