Fixes 21

Description

[ ] I have performed a self-review of my own code
[ ] I have commented my code, particularly in hard-to-understand areas
[ ] I have cleaned up the code in the areas my change touches
[ ] My changes generate no new warnings
[ ] Any dependent changes have been merged and published in downstream modules
[ ] I have checked my code and corrected any misspellings
[ ] I have removed any unnecessary console messages
[ ] I have included all english text to the translation file and/or created a new issue with the required translations for the currently supported languages
[ ] I have tested for mobile functionality and responsiveness
[ ] I have added appropriate test coverage
[ ] I have updated relevant documentation and/or opened a separate issue to cover the updates (Issue URL: )