further improvements on button highlighting