made active button highlighting consistent