Fixed small aestethics
Added pagination