Replace custom events with angulars
Fix angular events #1