Some fine tunning
Removing old jquery live method