Updated smart-on-fhir layout