Improved state dragging
Button Size for the control bar and the toolbar adjusted