added pagination and simplified button classes