Issue Number (if Applicable): Fixes #

#Description

Please include a summary of the changes and which issue is fixed / feature is added.

#Pull Request - Checklist

• Initial Manual Tests Passed
• Double check modified code and verify it with the feature/task requirements
• Format code
• Look for code duplication
• Clear naming for variables and methods
• Manual tests in accessibility mode (TalkBack on Android) passed