updated jqui functionality)
Resolved merge conflicts