Added Templates (missing before) and updated pick and summary view.