Bas commit merge & backend bug fixes

Merged the following commit to master:

https://github.com/AuditeMarlow/NLX-Webshop/commit/0d6423b82ad96c8d66d657d3c8ebbd7f3e5eae0f

Backend bug fixes too.