Add error screen feature
Add pagination feature