infobox changes, design changes
merge