Move pagination and search button into widgets