Minor template selection layout fixes.