Add hover effects
Resolve merge