add cart highlighting change
add highlighting new items and hiding empty cart
fix conflicts