small fix
Merge remote-tracking branch 'origin/feature/newUI' into feature/newUI