Revert "Revert "incorportated Chat into project""

This reverts commit 2844ad33a7ccc7b9e6bb17f030b60db5300fddaf.
merged chat with layout