#1204 - Changed checkboxes to buttons and fixed some bugs pertaining to failed category lookup