add GAI and layout update
Merge branch 'GA-integration'