Ready to merge

Use more JQuery functionality