Layout changes for new height spec