Merge

optional chat component, fixing labels