Prototype for new labeling, and fixed "un-click" problem with buttons.js