more work on layout
more layout work