Added pagination
Added icons