Modularize code

Modularize code to support More Comments Button