Athletics fixes
Merge branch 'fac-layout-jay' into fac-layout