Move highlight rendering back to with event rendering so that sizing happens correctly.