Revert "Revert "before UI change""

This reverts commit fda4f1481d4be207a25a2cee32efd5a6040e3363.