In Progress

JQuery conflict, bug-fixing