Fix bugs

Fix Hover