383 template selection redesign

Closes issue #383.