improved expand/hover functionality