[Closes #40, closes #38,  closes #37,  closes #36,  closes #33, closed #32] Fixed a bug affecting the category display and renamed several fields