Fix layout
Add draggable