Info box cleanup
Merge infobox changes