Form improvements and fixes