Add form elements to core reset list. Minor bugfixes