Making control buttons work better