Added pagination, redirect