Change PunishmentForm and other fails.
Merge branch 'gorka' of https://github.com/Upplication/The-Punisher.git into gorka