Major Changes to the functionality of CommentsView and it's respective buttons.

Change-Id: Ic567b4f9fe437287f94892651e9ba3620fe24c5c