Fixed some issue and removed hint animation