Added support for selecting invoice design