changed controller setup, added EventBus