button and form bugfixes