Add Draggable Gadjet and refactor calculator
Refactor calc