fixed issue with pagination
Fixed missing navigation button
Clean up
Added data files