Updates merge

Merged the following 2 commits:

https://github.com/AuditeMarlow/NLX-Webshop/commit/a92c8d9a649ff36524207c08334d460bc38b713b

https://github.com/AuditeMarlow/NLX-Webshop/commit/b7ef5bc1177bb476240a5a4e8779e3b12848c412