Updated controllers, added pagination