fixes, disables buttons after submission
adjusted token adding logic