Improve form interactions