updated layout, included event dispatcher for debugging events