Fixed bug and made commenting area collapsable/expandable
Removed obsolete if clause