refactored following buttons