Changed comments, fixed editing button