New save icon, modularize form generation