more layout tweaks per feedback