Added pagination and UI improvements