Fix whitespace.
Rearrange top widgets; remove Roland's deprecated stuff.