Fixed Issue: fix form elements wider in page/form