Tweak foundation from feedback round 1

##from: support