refactoring of batches views; closes #439