fixed layout
Added pagination