Fixed some JS issue and Manager issue