Simplify finding an embeddable's activity
Refactoring some controllers to reduce complexity