Remove extra line and add pagination