Follow-up from "Adds FE for ui setting"

The following discussion from !200503 (merged) should be addressed:

Edited by Anna Vovchenko