comments added. And cut JS from Template to different file
conflicts solved