Tweaks to locale and layout