Issue #2279723 by DanChadwick: Fixed removing form IDs when #state is used.
Issue #2284599: Changed Submit button to Save for finished submission & button code cleanup.