Upsmall layout tweaks