Fixed Issue: Better popup forms and buttons
Fixed Issue: Set popup form submit value to original submit value