refactor and add discussion sidebar labels