Polish tip button and tip popup UI.
fixup test code