add modular views. Events probe fixed