Modified number of entries per page
Removed unwanted code