Added more flexible combo box template