Added JQuery UI
Resolved the merge conflicts