fixed toggles and changed input type submit to buttons