EventManager, integrated button class, fixes