Rewrite comments and update CSS