add paginate
check for layout file
clean up