Fixed context issue with controller events
WIP styling