fixed bugs for top menu, added more event types