Layout plus fiddling

just a bunch of  small fiddling