Added event dialog, some fixes