considerable tweaking

Closing in on layout