Updated form design
Bug fix on integer handling