Fixes #4: refactored EuiController