Tweak to parts layout, tighter