Fix bug with content being populated incorrect order.
Testing Done:
Issue Number:
Approved by:
Reviewed by: