Control buttons refactored