hotfix for form id, minor changes to prevent underline in buttons