Refactor and enfeature home and comment page