Fixed commenting issue & comment blocking list layout fix