Add new buttons and comments, Still working on trigger