patrick changes
layout changes
Merge branch 'pat_temp'