Updated settings. Added pagination.