Fixes issue #50, #51

Fixes issue #50, #51.

Initial code pull for issue #48, still needs work on the presentation of the data grids.