Overall tweaking. Added a pagination widget