improved UI and drag&drop