Template for type selection menu 
Fix merge 
Merge commit '33edb3e91825021ad2cd3335ea212f03ab92dca5' into css-changes