Fix potential bug in event retrieving logic
Fix markup
Create modal and entityEditor modules