Added comments and buttons