more layout tweaking