test layout changes
merging in Jeremy changes