Simplified controllers, added category controller