Bug Fixes
Merge remote-tracking branch 'origin/uiRefactor' into uiRefactor