diff --git a/resources/views/bills/create.twig b/resources/views/bills/create.twig
index a2663bff18..9bfde12466 100644
--- a/resources/views/bills/create.twig
+++ b/resources/views/bills/create.twig
@@ -17,7 +17,7 @@
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.text('name') }}
-                        {{ ExpandedForm.select('transaction_currency_id',currencies, defaultCurrency.id) }}
+                        {{ ExpandedForm.currencyList('transaction_currency_id', defaultCurrency.id) }}
                         {{ ExpandedForm.amountNoCurrency('amount_min') }}
                         {{ ExpandedForm.amountNoCurrency('amount_max') }}
                         {{ ExpandedForm.date('date',phpdate('Y-m-d')) }}
diff --git a/resources/views/bills/edit.twig b/resources/views/bills/edit.twig
index e64d063905..6302b36198 100644
--- a/resources/views/bills/edit.twig
+++ b/resources/views/bills/edit.twig
@@ -18,7 +18,7 @@
                 </div>
                 <div class="box-body">
                     {{ ExpandedForm.text('name') }}
-                    {{ ExpandedForm.select('transaction_currency_id',currencies) }}
+                    {{ ExpandedForm.currencyList('transaction_currency_id') }}
                     {{ ExpandedForm.amountNoCurrency('amount_min') }}
                     {{ ExpandedForm.amountNoCurrency('amount_max') }}
                     {{ ExpandedForm.date('date',bill.date.format('Y-m-d')) }}
diff --git a/resources/views/export/index.twig b/resources/views/export/index.twig
index a772feb710..57851bf641 100644
--- a/resources/views/export/index.twig
+++ b/resources/views/export/index.twig
@@ -74,7 +74,7 @@
 
 
                                     {# ACCOUNTS #}
-                                    {{ ExpandedForm.multiCheckbox('accounts',accountList, checked, {' class': 'account-checkbox'}) }}
+                                    {{ ExpandedForm.assetAccountCheckList('accounts', {' class': 'account-checkbox','select_all': true}) }}
 
                                     {{ ExpandedForm.checkbox('include_attachments','1', true) }}
 
diff --git a/resources/views/rules/rule-group/select-transactions.twig b/resources/views/rules/rule-group/select-transactions.twig
index 6ae7769f03..5f13406cc7 100644
--- a/resources/views/rules/rule-group/select-transactions.twig
+++ b/resources/views/rules/rule-group/select-transactions.twig
@@ -28,7 +28,7 @@
                                 <div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
                                     {{ ExpandedForm.date('start_date', first) }}
                                     {{ ExpandedForm.date('end_date', today) }}
-                                    {{ ExpandedForm.multiCheckbox('accounts',accountList, checkedAccounts, {' class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }}
+                                    {{ ExpandedForm.assetAccountCheckList('accounts', {'select_all': true,'class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }}
                                 </div>
                             </div>
                         </div>
diff --git a/resources/views/rules/rule/create.twig b/resources/views/rules/rule/create.twig
index 5c04e33608..569789fadb 100644
--- a/resources/views/rules/rule/create.twig
+++ b/resources/views/rules/rule/create.twig
@@ -38,7 +38,7 @@
                     <div class="box-body">
                         {{ ExpandedForm.text('title') }}
                         {{ ExpandedForm.select('trigger',allJournalTriggers()) }}
-                        {{ ExpandedForm.select('rule_group_id',groups, ruleGroup.id) }}
+                        {{ ExpandedForm.ruleGroupList('rule_group_id', ruleGroup.id) }}
                         {{ ExpandedForm.checkbox('stop_processing',1,null, {helpText: trans('firefly.rule_help_stop_processing')}) }}
                         {{ ExpandedForm.checkbox('strict',1, null,{helpText: trans('firefly.rule_help_strict')}) }}
                     </div>
diff --git a/resources/views/rules/rule/edit.twig b/resources/views/rules/rule/edit.twig
index 61226548b3..dad8d5871c 100644
--- a/resources/views/rules/rule/edit.twig
+++ b/resources/views/rules/rule/edit.twig
@@ -15,7 +15,7 @@
                 </div>
                 <div class="box-body">
                     {{ ExpandedForm.text('title') }}
-                    {{ ExpandedForm.select('rule_group_id', ruleGroups) }}
+                    {{ ExpandedForm.ruleGroupList('rule_group_id', ruleGroup.id) }}
                     {{ ExpandedForm.select('trigger',allJournalTriggers(), primaryTrigger) }}
                     {{ ExpandedForm.checkbox('active',1,rule.active, {helpText: trans('firefly.rule_help_active')}) }}
                     {{ ExpandedForm.checkbox('stop_processing',1,rule.stop_processing, {helpText: trans('firefly.rule_help_stop_processing')}) }}
diff --git a/resources/views/rules/rule/select-transactions.twig b/resources/views/rules/rule/select-transactions.twig
index 39fe00f7de..65df2aabff 100644
--- a/resources/views/rules/rule/select-transactions.twig
+++ b/resources/views/rules/rule/select-transactions.twig
@@ -28,7 +28,7 @@
                                 <div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
                                     {{ ExpandedForm.date('start_date', first) }}
                                     {{ ExpandedForm.date('end_date', today) }}
-                                    {{ ExpandedForm.multiCheckbox('accounts',accountList, checkedAccounts, {' class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }}
+                                    {{ ExpandedForm.assetAccountCheckList('accounts', {'select_all': true,  'class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }}
                                 </div>
                             </div>
                         </div>