Finished event store and refactoring in InstructionSelectorDialog