Added pagination and other color and spacing tweeks