Rewrote a lot of button rendering stuff - now handles more than two buttons!