Enhanced Submitted form functionality