Refactor of user-story buttons