Tweaks to parts layout, etc.