simplify buttons and add message box