Add cart event and few code corrections