need to rewrite comment and css logic