Adjust UI - Fix BC declaration and visualization