Fix some bug and add button remove comment

Fix some bug and add button remove comment