Rework jqui option building and add more options to the draggable directive