Updated windows form