More shuffling, refactoring in lfp viewer, to render