[#13] Change infobox to be manual with reordered fields.
Merge pull request #14 from fureigh/13-improve-infoboxes

[#13] Change infobox to be manual with reordered fields.