Moving widgets and getting more in shape.
Merge branch 'david'