Make form field placement better in Hathor