minor margin and layout tweaks