Moved text drawing out of buttonstyle