layout tweaks
merge