Tweaks to make the UI portion *work*.