Tweaks to populating the button list.