Events & UI fix