Refactored path/event routing. Simplified UI