Fixes highliting of active buttons