more refactoring for nested views, choosing bomb vs match now one function