Fixes majority of bugs in Comments and Activity View.

Change-Id: If66337c696aff57911c60a9f5604dcd8c396700f