reformat code & add dragable