Menu highlight improvements