implement events and fix columns for both, add links