Fix selection when dragging.
Make more names more descriptive.
Rename components