Move pagination and search button into widgets
Remove TODOs which were done in last commit
Merge pull request #2290 from mahagr/feature-hmvc

Move pagination and search button into widgets