Merge branch 'hotfix/submodules'
Fixes styling on native page
Merge branch 'hotfix/ui-fixes' into develop