Added proper form creation, success