fixes and layout changes to draggable element