More work on pagination widget