Updated and corrected parts layout