Modularize more returned HTML