update layout
Merge branch 'annguyen' into develop

Update Layout