Adds Edit and Search controllers, cleans up dependency injection