Refactored forms in nereid-webshop #4242