Updated TODO
Fixed undefined message for noAction click handler