Enhance& fix block form