Discussions and Comments UI fixed