layout cont.
Merge remote-tracking branch 'origin/Layout-HomePage-Chad'
merging