Update icons, add filter on events, added analytics