add todo ,remove comment,fix ui