Various tweaks.
Some more work on layout