formatting tweaks, trying to get the layout right