finish cleaning up button rewrite, move on to text-box rewrite--nearly
done