Slight adjustments to design
Add pagination