Comment view fixes