Improved preparation iterface with templates