Modified UI setup scripts
Modified UI setup scripts
Modified UI setup scripts
Merge commit '52733fd85f8c9a0dac9fa440bbe5eee9e84598f3' into HEAD