UpperBar extracted to a UserControl
Repaired "move window"