cbu

Ready for UI improvement.
cbu
Revert "cbu"

This reverts commit 6f1d4d946157a73571ea9f5da95dc3438ce6b9a3.