fixed tooltip
separated js files
resolve merge conflicts