Improve UI; walk with cabinet UI