Improve styles and drag-and-drop controls