Some new pages, fixed datastore and viewing. TODO: fix sort