Merge "Fix the top summary layout." into oc-dev