Back to semi-working state after layout mods. Lots more to do.