Reordered navigation; rewrote pagination logic; begun major code refactor