more work on dragging screen, icons, some refactoring