setup form improvements