updated javascript & removed some redirections