bugfixs / tweaks with Next button