mouse-doesn't-work-on-drag-bug is fixed. Some style improvements