Minor cleanup
Moved CommandBar to widgets. Added test