Commit local changes to the UI to the 0.20.3 branch

Commit to the branch in order to merge to the current 0.20.4
Commit UI changes