Font and few layout tweaks