Fix draggable. Styling, Refactoring
A little bit of cleanup