indenting and layout tweaks