Added Mike's Layout changes.