removed some controllers and added pagination