Few more layout tweaks