Continuing to move to dockable forms

Not stable