Added pagination and color changes