hover bug fixed + Names fixed