Enhance some form functionality