Client side pagination and UI tweak - additional files