Improve the presentation during creating prototypes. Fixes #2526