minor bugfixes and next component submit button confirm