Adding latest changes with some hover states